Changeset 159597 in webkit

Timestamp:

Nov 20, 2013, 5:11:28 PM (12 years ago)

Author:

beidson@apple.com

Message:

Add argument coders for IDBDatabaseMetadata classes
​https://bugs.webkit.org/show_bug.cgi?id=124689

Reviewed by Anders Carlsson.

Add coders for:

• IDBDatabaseMetadata
• IDBIndexMetadata
• IDBKeyPath
• IDBObjectStoreMetadata

• Shared/WebCoreArgumentCoders.cpp:

(CoreIPC::::encode):
(CoreIPC::::decode):

• Shared/WebCoreArgumentCoders.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebCoreArgumentCoders.cpp (modified) (2 diffs)
• Shared/WebCoreArgumentCoders.h (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-11-20  Brady Eidson  <beidson@apple.com>
+
+        Add argument coders for IDBDatabaseMetadata classes
+        https://bugs.webkit.org/show_bug.cgi?id=124689
+
+        Reviewed by Anders Carlsson.
+
+        Add coders for:
+          - IDBDatabaseMetadata
+          - IDBIndexMetadata
+          - IDBKeyPath
+          - IDBObjectStoreMetadata
+
+        * Shared/WebCoreArgumentCoders.cpp:
+        (CoreIPC::::encode):
+        (CoreIPC::::decode):
+        * Shared/WebCoreArgumentCoders.h:
+
 2013-11-20  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp

@@ -41 +41 @@
 #include <WebCore/GraphicsContext.h>
 #include <WebCore/GraphicsLayer.h>
+#include <WebCore/IDBDatabaseMetadata.h>
+#include <WebCore/IDBKeyPath.h>
 #include <WebCore/Image.h>
 #include <WebCore/Length.h>
@@ -1309 +1311 @@
 #endif // ENABLE(CSS_FILTERS) && !USE(COORDINATED_GRAPHICS)
 
+#if ENABLE(INDEXED_DATABASE)
+void ArgumentCoder<IDBDatabaseMetadata>::encode(ArgumentEncoder& encoder, const IDBDatabaseMetadata& metadata)
+{
+    encoder << metadata.name << metadata.id << metadata.version << metadata.maxObjectStoreId << metadata.objectStores;
+}
+
+bool ArgumentCoder<IDBDatabaseMetadata>::decode(ArgumentDecoder& decoder, IDBDatabaseMetadata& metadata)
+{
+    if (!decoder.decode(metadata.name))
+        return false;
+
+    if (!decoder.decode(metadata.id))
+        return false;
+
+    if (!decoder.decode(metadata.version))
+        return false;
+
+    if (!decoder.decode(metadata.maxObjectStoreId))
+        return false;
+
+    if (!decoder.decode(metadata.objectStores))
+        return false;
+
+    return true;
+}
+
+void ArgumentCoder<IDBIndexMetadata>::encode(ArgumentEncoder& encoder, const IDBIndexMetadata& metadata)
+{
+    encoder << metadata.name << metadata.id << metadata.keyPath << metadata.unique << metadata.multiEntry;
+}
+
+bool ArgumentCoder<IDBIndexMetadata>::decode(ArgumentDecoder& decoder, IDBIndexMetadata& metadata)
+{
+    if (!decoder.decode(metadata.name))
+        return false;
+
+    if (!decoder.decode(metadata.id))
+        return false;
+
+    if (!decoder.decode(metadata.keyPath))
+        return false;
+
+    if (!decoder.decode(metadata.unique))
+        return false;
+
+    if (!decoder.decode(metadata.multiEntry))
+        return false;
+
+    return true;
+}
+
+void ArgumentCoder<IDBKeyPath>::encode(ArgumentEncoder& encoder, const IDBKeyPath& keyPath)
+{
+    encoder.encodeEnum(keyPath.type());
+
+    switch (keyPath.type()) {
+    case IDBKeyPath::NullType:
+        break;
+    case IDBKeyPath::StringType:
+        encoder << keyPath.string();
+        break;
+    case IDBKeyPath::ArrayType:
+        encoder << keyPath.array();
+        break;
+    default:
+        ASSERT_NOT_REACHED();
+    }
+}
+
+bool ArgumentCoder<IDBKeyPath>::decode(ArgumentDecoder& decoder, IDBKeyPath& keyPath)
+{
+    IDBKeyPath::Type type;
+    if (!decoder.decodeEnum(type))
+        return false;
+
+    switch (type) {
+    case IDBKeyPath::NullType:
+        keyPath = IDBKeyPath();
+        return true;
+
+    case IDBKeyPath::StringType: {
+        String string;
+        if (!decoder.decode(string))
+            return false;
+
+        keyPath = IDBKeyPath(string);
+        return true;
+    }
+    case IDBKeyPath::ArrayType: {
+        Vector<String> array;
+        if (!decoder.decode(array))
+            return false;
+
+        keyPath = IDBKeyPath(array);
+        return true;
+    }
+    default:
+        return false;
+    }
+}
+
+void ArgumentCoder<IDBObjectStoreMetadata>::encode(ArgumentEncoder& encoder, const IDBObjectStoreMetadata& metadata)
+{
+    encoder << metadata.name << metadata.id << metadata.keyPath << metadata.autoIncrement << metadata.maxIndexId << metadata.indexes;
+}
+
+bool ArgumentCoder<IDBObjectStoreMetadata>::decode(ArgumentDecoder& decoder, IDBObjectStoreMetadata& metadata)
+{
+    if (!decoder.decode(metadata.name))
+        return false;
+
+    if (!decoder.decode(metadata.id))
+        return false;
+
+    if (!decoder.decode(metadata.keyPath))
+        return false;
+
+    if (!decoder.decode(metadata.autoIncrement))
+        return false;
+
+    if (!decoder.decode(metadata.maxIndexId))
+        return false;
+
+    if (!decoder.decode(metadata.indexes))
+        return false;
+
+    return true;
+}
+#endif
+
 } // namespace CoreIPC

trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h

@@ -42 +42 @@
 class FloatSize;
 class HTTPHeaderMap;
+class IDBKeyPath;
 class IntPoint;
 class IntRect;
@@ -61 +62 @@
 struct DragSession;
 struct FileChooserSettings;
+struct IDBDatabaseMetadata;
+struct IDBIndexMetadata;
+struct IDBObjectStoreMetadata;
 struct Length;
 struct GrammarDetail;
@@ -299 +303 @@
 #endif
 
+#if ENABLE(INDEXED_DATABASE)
+template<> struct ArgumentCoder<WebCore::IDBDatabaseMetadata> {
+    static void encode(ArgumentEncoder&, const WebCore::IDBDatabaseMetadata&);
+    static bool decode(ArgumentDecoder&, WebCore::IDBDatabaseMetadata&);
+};
+
+template<> struct ArgumentCoder<WebCore::IDBIndexMetadata> {
+    static void encode(ArgumentEncoder&, const WebCore::IDBIndexMetadata&);
+    static bool decode(ArgumentDecoder&, WebCore::IDBIndexMetadata&);
+};
+
+template<> struct ArgumentCoder<WebCore::IDBKeyPath> {
+    static void encode(ArgumentEncoder&, const WebCore::IDBKeyPath&);
+    static bool decode(ArgumentDecoder&, WebCore::IDBKeyPath&);
+};
+
+template<> struct ArgumentCoder<WebCore::IDBObjectStoreMetadata> {
+    static void encode(ArgumentEncoder&, const WebCore::IDBObjectStoreMetadata&);
+    static bool decode(ArgumentDecoder&, WebCore::IDBObjectStoreMetadata&);
+};
+#endif
+
 } // namespace CoreIPC