Changeset 125730 in webkit

Timestamp:

Aug 15, 2012, 5:57:53 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

IndexedDB: IDB*::keyPath should return IDBKeyPath, not IDBAny
​https://bugs.webkit.org/show_bug.cgi?id=92434

Patch by Alec Flett <​alecflett@chromium.org> on 2012-08-15
Reviewed by Tony Chang.

Clean up IDBKeyPath conversion to IDBAny objects. This gets rid of
some implicit conversion from IDBKeyPath to IDBAny.

No new tests, just changing method signatures.

• Modules/indexeddb/IDBAny.cpp:

(WebCore::IDBAny::set):
(WebCore):

• Modules/indexeddb/IDBAny.h:

(WebCore):
(WebCore::IDBAny::create):
(IDBAny):

• Modules/indexeddb/IDBIndex.h:

(WebCore::IDBIndex::keyPathAny):
(WebCore::IDBIndex::keyPath):

• Modules/indexeddb/IDBIndex.idl:
• Modules/indexeddb/IDBKeyPath.cpp:
• Modules/indexeddb/IDBKeyPath.h:
• Modules/indexeddb/IDBObjectStore.h:

(WebCore::IDBObjectStore::keyPathAny):
(WebCore::IDBObjectStore::keyPath):

• Modules/indexeddb/IDBObjectStore.idl:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb/IDBAny.cpp (modified) (2 diffs)
• Modules/indexeddb/IDBAny.h (modified) (3 diffs)
• Modules/indexeddb/IDBIndex.h (modified) (1 diff)
• Modules/indexeddb/IDBIndex.idl (modified) (1 diff)
• Modules/indexeddb/IDBKeyPath.cpp (modified) (1 diff)
• Modules/indexeddb/IDBKeyPath.h (modified) (2 diffs)
• Modules/indexeddb/IDBObjectStore.h (modified) (1 diff)
• Modules/indexeddb/IDBObjectStore.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-15  Alec Flett  <alecflett@chromium.org>
+
+        IndexedDB: IDB*::keyPath should return IDBKeyPath, not IDBAny
+        https://bugs.webkit.org/show_bug.cgi?id=92434
+
+        Reviewed by Tony Chang.
+
+        Clean up IDBKeyPath conversion to IDBAny objects. This gets rid of
+        some implicit conversion from IDBKeyPath to IDBAny.
+
+        No new tests, just changing method signatures.
+
+        * Modules/indexeddb/IDBAny.cpp:
+        (WebCore::IDBAny::set):
+        (WebCore):
+        * Modules/indexeddb/IDBAny.h:
+        (WebCore):
+        (WebCore::IDBAny::create):
+        (IDBAny):
+        * Modules/indexeddb/IDBIndex.h:
+        (WebCore::IDBIndex::keyPathAny):
+        (WebCore::IDBIndex::keyPath):
+        * Modules/indexeddb/IDBIndex.idl:
+        * Modules/indexeddb/IDBKeyPath.cpp:
+        * Modules/indexeddb/IDBKeyPath.h:
+        * Modules/indexeddb/IDBObjectStore.h:
+        (WebCore::IDBObjectStore::keyPathAny):
+        (WebCore::IDBObjectStore::keyPath):
+        * Modules/indexeddb/IDBObjectStore.idl:
+
 2012-08-15  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/Modules/indexeddb/IDBAny.cpp

@@ -33 +33 @@
 #include "IDBFactory.h"
 #include "IDBIndex.h"
+#include "IDBKeyPath.h"
 #include "IDBObjectStore.h"
 #include "SerializedScriptValue.h"
@@ -208 +209 @@
 }
 
+void IDBAny::set(const IDBKeyPath& value)
+{
+    ASSERT(m_type == UndefinedType);
+    switch (value.type()) {
+    case IDBKeyPath::NullType:
+        m_type = NullType;
+        break;
+    case IDBKeyPath::StringType:
+        m_type = StringType;
+        m_string = value.string();
+        break;
+    case IDBKeyPath::ArrayType:
+        RefPtr<DOMStringList> keyPaths = DOMStringList::create();
+        for (Vector<String>::const_iterator it = value.array().begin(); it != value.array().end(); ++it)
+            keyPaths->append(*it);
+        m_type = DOMStringListType;
+        m_domStringList = keyPaths.release();
+        break;
+    }
+}
+
 void IDBAny::set(const String& value)
 {

trunk/Source/WebCore/Modules/indexeddb/IDBAny.h

@@ -43 +43 @@
 class IDBIndex;
 class IDBKey;
+class IDBKeyPath;
 class IDBObjectStore;
 class IDBTransaction;
@@ -57 +58 @@
         RefPtr<IDBAny> any = IDBAny::createInvalid();
         any->set(idbObject);
+        return any.release();
+    }
+    static PassRefPtr<IDBAny> create(const IDBKeyPath& keyPath)
+    {
+        RefPtr<IDBAny> any = IDBAny::createInvalid();
+        any->set(keyPath);
         return any.release();
     }
@@ -110 +117 @@
     void set(PassRefPtr<IDBTransaction>);
     void set(PassRefPtr<SerializedScriptValue>);
+    void set(const IDBKeyPath&);
     void set(const String&);
 

trunk/Source/WebCore/Modules/indexeddb/IDBIndex.h

@@ -54 +54 @@
     const String name() const { return m_metadata.name; }
     PassRefPtr<IDBObjectStore> objectStore() const { return m_objectStore; }
-    PassRefPtr<IDBAny> keyPath() const { return m_metadata.keyPath; }
+    PassRefPtr<IDBAny> keyPathAny() const { return IDBAny::create(m_metadata.keyPath); }
+    const IDBKeyPath keyPath() const { return m_metadata.keyPath; }
     bool unique() const { return m_metadata.unique; }
     bool multiEntry() const { return m_metadata.multiEntry; }

trunk/Source/WebCore/Modules/indexeddb/IDBIndex.idl

@@ -31 +31 @@
         readonly attribute DOMString name;
         readonly attribute IDBObjectStore objectStore;
-        readonly attribute IDBAny keyPath;
+        readonly attribute [ImplementedAs=keyPathAny] IDBAny keyPath;
         readonly attribute boolean unique;
         readonly attribute boolean multiEntry;

trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp

@@ -220 +220 @@
 }
 
-IDBKeyPath::operator PassRefPtr<IDBAny>() const
-{
-    switch (m_type) {
-    case NullType:
-        return IDBAny::createNull();
-    case StringType:
-        return IDBAny::createString(m_string);
-    case ArrayType:
-        RefPtr<DOMStringList> keyPaths = DOMStringList::create();
-        for (Vector<String>::const_iterator it = m_array.begin(); it != m_array.end(); ++it)
-        keyPaths->append(*it);
-        return IDBAny::create(static_cast<PassRefPtr<DOMStringList> >(keyPaths));
-    }
-    ASSERT_NOT_REACHED();
-    return 0;
-}
-
-bool IDBKeyPath::operator==(PassRefPtr<IDBAny> other) const
-{
-    if (!isValid())
-        return false;
-
-    switch (m_type) {
-    case NullType:
-        return other->type() == IDBAny::NullType;
-    case StringType:
-        return other->type() == IDBAny::StringType && other->string() == string();
-    case ArrayType:
-        if (other->type() != IDBAny::DOMStringListType)
-            return false;
-
-        RefPtr<DOMStringList> otherList = other->domStringList();
-        for (size_t i = 0; i < m_array.size(); ++i) {
-            if (otherList->item(i) != m_array[i])
-                return false;
-        }
-        return true;
-    }
-    ASSERT_NOT_REACHED();
-    return false;
-}
-
 bool IDBKeyPath::operator==(const IDBKeyPath& other) const
 {

trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h

@@ -29 +29 @@
 #if ENABLE(INDEXED_DATABASE)
 
-#include "IDBAny.h"
 #include "PlatformString.h"
 #include <wtf/Vector.h>
@@ -72 +71 @@
     bool isNull() const { return m_type == NullType; }
     bool isValid() const;
-    operator PassRefPtr<IDBAny>() const;
-    bool operator==(PassRefPtr<IDBAny> other) const;
     bool operator==(const IDBKeyPath& other) const;
 

trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.h

@@ -59 +59 @@
     // Implement the IDBObjectStore IDL
     const String name() const { return m_metadata.name; }
-    PassRefPtr<IDBAny> keyPath() const { return m_metadata.keyPath; }
+    PassRefPtr<IDBAny> keyPathAny() const { return IDBAny::create(m_metadata.keyPath); }
+    const IDBKeyPath keyPath() const { return m_metadata.keyPath; }
     PassRefPtr<DOMStringList> indexNames() const;
     PassRefPtr<IDBTransaction> transaction() const { return m_transaction; }

trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.idl

@@ -30 +30 @@
     ] IDBObjectStore {
         readonly attribute [TreatReturnedNullStringAs=Null] DOMString name;
-        readonly attribute IDBAny keyPath;
+        readonly attribute [ImplementedAs=keyPathAny] IDBAny keyPath;
         readonly attribute DOMStringList indexNames;
         readonly attribute IDBTransaction transaction;