Changeset 160381 in webkit

Timestamp:

Dec 10, 2013 1:07:26 PM (10 years ago)

Author:

andersca@apple.com

Message:

Add more API object types to UserData
​https://bugs.webkit.org/show_bug.cgi?id=125532

Reviewed by Beth Dakin.

• Shared/UserData.cpp:

(WebKit::UserData::transform):
Handle dictionaries.

(WebKit::UserData::encode):
(WebKit::UserData::decode):
Handle more API::Objects.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/UserData.cpp (modified) (5 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-10  Anders Carlsson  <andersca@apple.com>
+
+        Add more API object types to UserData
+        https://bugs.webkit.org/show_bug.cgi?id=125532
+
+        Reviewed by Beth Dakin.
+
+        * Shared/UserData.cpp:
+        (WebKit::UserData::transform):
+        Handle dictionaries.
+
+        (WebKit::UserData::encode):
+        (WebKit::UserData::decode):
+        Handle more API::Objects.
+
 2013-12-10  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/UserData.cpp

@@ -31 +31 @@
 #include "ArgumentCoders.h"
 #include "ArgumentEncoder.h"
+#include "MutableDictionary.h"
 #include "WebNumber.h"
+#include "WebSerializedScriptValue.h"
+#include "WebString.h"
 #include "WebURL.h"
 
@@ -59 +62 @@
 
         return API::Array::create(std::move(elements));
+    }
+
+    if (object->type() == API::Object::Type::Dictionary) {
+        auto& dictionary = static_cast<ImmutableDictionary&>(*object);
+
+        ImmutableDictionary::MapType map;
+        for (const auto& keyValuePair : dictionary.map())
+            map.add(keyValuePair.key, transform(keyValuePair.value.get(), transformer));
+
+        return ImmutableDictionary::adopt(map);
     }
 
@@ -107 +120 @@
     }
 
+    case API::Object::Type::Dictionary: {
+        auto& dictionary = static_cast<const ImmutableDictionary&>(object);
+        auto& map = dictionary.map();
+
+        encoder << map.size();
+        for (const auto& keyValuePair : map) {
+            encoder << keyValuePair.key;
+            encode(encoder, keyValuePair.value.get());
+        }
+        break;
+    }
+
     case API::Object::Type::FrameHandle: {
         auto& frameHandle = static_cast<const API::FrameHandle&>(object);
         encoder << frameHandle.frameID();
+        break;
+    }
+
+    case API::Object::Type::SerializedScriptValue: {
+        auto& serializedScriptValue = static_cast<const WebSerializedScriptValue&>(object);
+        encoder << serializedScriptValue.dataReference();
+        break;
+    }
+
+    case API::Object::Type::String: {
+        auto& string = static_cast<const WebString&>(object);
+        encoder << string.string();
         break;
     }
@@ -164 +201 @@
     }
 
+    case API::Object::Type::Dictionary: {
+        uint64_t size;
+        if (!decoder.decode(size))
+            return false;
+
+        ImmutableDictionary::MapType map;
+        for (size_t i = 0; i < size; ++i) {
+            String key;
+            if (!decoder.decode(key))
+                return false;
+
+            RefPtr<API::Object> value;
+            if (!decode(decoder, value))
+                return false;
+
+            if (!map.add(std::move(key), std::move(value)).isNewEntry)
+                return false;
+        }
+
+        result = ImmutableDictionary::adopt(map);
+        break;
+    }
+
     case API::Object::Type::FrameHandle: {
         uint64_t frameID;
@@ -177 +237 @@
         break;
 
+    case API::Object::Type::SerializedScriptValue: {
+        CoreIPC::DataReference dataReference;
+        if (!decoder.decode(dataReference))
+            return false;
+
+        auto vector = dataReference.vector();
+        result = WebSerializedScriptValue::adopt(vector);
+        break;
+    }
+
+    case API::Object::Type::String: {
+        String string;
+        if (!decoder.decode(string))
+            return false;
+
+        result = WebString::create(string);
+        break;
+    }
+
     case API::Object::Type::URL: {
         String string;