Title: [159597] trunk/Source/WebKit2
- Revision
- 159597
- Author
- [email protected]
- Date
- 2013-11-20 17:11:28 -0800 (Wed, 20 Nov 2013)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (159596 => 159597)
--- trunk/Source/WebKit2/ChangeLog 2013-11-21 01:07:19 UTC (rev 159596)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-21 01:11:28 UTC (rev 159597)
@@ -1,3 +1,21 @@
+2013-11-20 Brady Eidson <[email protected]>
+
+ 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 <[email protected]>
Enable PageLoadTest assertions again
Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (159596 => 159597)
--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2013-11-21 01:07:19 UTC (rev 159596)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2013-11-21 01:11:28 UTC (rev 159597)
@@ -40,6 +40,8 @@
#include <WebCore/FilterOperations.h>
#include <WebCore/GraphicsContext.h>
#include <WebCore/GraphicsLayer.h>
+#include <WebCore/IDBDatabaseMetadata.h>
+#include <WebCore/IDBKeyPath.h>
#include <WebCore/Image.h>
#include <WebCore/Length.h>
#include <WebCore/PluginData.h>
@@ -1308,4 +1310,134 @@
}
#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
Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (159596 => 159597)
--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2013-11-21 01:07:19 UTC (rev 159596)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2013-11-21 01:11:28 UTC (rev 159597)
@@ -41,6 +41,7 @@
class FloatRect;
class FloatSize;
class HTTPHeaderMap;
+class IDBKeyPath;
class IntPoint;
class IntRect;
class IntSize;
@@ -60,6 +61,9 @@
struct DictationAlternative;
struct DragSession;
struct FileChooserSettings;
+struct IDBDatabaseMetadata;
+struct IDBIndexMetadata;
+struct IDBObjectStoreMetadata;
struct Length;
struct GrammarDetail;
struct MimeClassInfo;
@@ -298,6 +302,28 @@
};
#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
#endif // WebCoreArgumentCoders_h
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
