Changeset 66693 in webkit

Timestamp:

Sep 2, 2010 4:57:22 PM (14 years ago)

Author:

weinig@apple.com

Message:

Add ability to send WKDictionaryRefs via post message.
​https://bugs.webkit.org/show_bug.cgi?id=45151

Reviewed by Anders Carlsson.

• Shared/ImmutableDictionary.cpp:

(WebKit::ImmutableDictionary::ImmutableDictionary):

• Shared/ImmutableDictionary.h:

(WebKit::ImmutableDictionary::adopt): Remove tag, it wasn't doing anything.
(WebKit::ImmutableDictionary::isMutable):
(WebKit::ImmutableDictionary::map): Add accessor of internal
map for encoder.

• Shared/UserMessageCoders.h:

(WebKit::UserMessageEncoder::baseEncode):
(WebKit::UserMessageDecoder::baseDecode):
Add encoder/decoder.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/ImmutableDictionary.cpp (modified) (1 diff)
• Shared/ImmutableDictionary.h (modified) (2 diffs)
• Shared/UserMessageCoders.h (modified) (5 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-09-02  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        Add ability to send WKDictionaryRefs via post message.
+        https://bugs.webkit.org/show_bug.cgi?id=45151
+
+        * Shared/ImmutableDictionary.cpp:
+        (WebKit::ImmutableDictionary::ImmutableDictionary):
+        * Shared/ImmutableDictionary.h:
+        (WebKit::ImmutableDictionary::adopt): Remove tag, it wasn't doing anything.
+        (WebKit::ImmutableDictionary::isMutable):
+        (WebKit::ImmutableDictionary::map): Add accessor of internal
+        map for encoder.
+
+        * Shared/UserMessageCoders.h:
+        (WebKit::UserMessageEncoder::baseEncode):
+        (WebKit::UserMessageDecoder::baseDecode):
+        Add encoder/decoder.
+
 2010-09-02  Sam Weinig  <sam@webkit.org>
 

trunk/WebKit2/Shared/ImmutableDictionary.cpp

@@ -35 +35 @@
 }
 
-ImmutableDictionary::ImmutableDictionary(MapType& map, AdoptTag)
+ImmutableDictionary::ImmutableDictionary(MapType& map)
 {
     m_map.swap(map);

trunk/WebKit2/Shared/ImmutableDictionary.h

@@ -51 +51 @@
     static PassRefPtr<ImmutableDictionary> adopt(MapType& map)
     {
-        return adoptRef(new ImmutableDictionary(map, Adopt));
+        return adoptRef(new ImmutableDictionary(map));
     }
     ~ImmutableDictionary();
+
+    virtual bool isMutable() { return false; }
 
     template<typename T>
@@ -77 +79 @@
     size_t size() { return m_map.size(); }
 
-    virtual bool isMutable() { return false; }
+    const MapType& map() { return m_map; }
 
 protected:
     ImmutableDictionary();
-    enum AdoptTag { Adopt };
-    ImmutableDictionary(MapType& map, AdoptTag);
+    ImmutableDictionary(MapType& map);
 
     virtual Type type() const { return APIType; }

trunk/WebKit2/Shared/UserMessageCoders.h

@@ -24 +24 @@
  */
 
+#include "ArgumentDecoder.h"
 #include "ArgumentEncoder.h"
-#include "ArgumentDecoder.h"
 #include "ImmutableArray.h"
+#include "ImmutableDictionary.h"
+#include "WebCoreArgumentCoders.h"
 #include "WebString.h"
 
@@ -32 +34 @@
 
 //   - Array -> Array
+//   - Dictionary -> Dictionary
 //   - String -> String
 
@@ -45 +48 @@
             for (size_t i = 0; i < array->size(); ++i)
                 encoder->encode(Owner(array->at(i)));
+            return true;
+        }
+        case APIObject::TypeDictionary: {
+            ImmutableDictionary* dictionary = static_cast<ImmutableDictionary*>(m_root);
+            const ImmutableDictionary::MapType& map = dictionary->map();
+            encoder->encode(static_cast<uint64_t>(map.size()));
+
+            ImmutableDictionary::MapType::const_iterator it = map.begin();
+            ImmutableDictionary::MapType::const_iterator end = map.end();
+            for (; it != end; ++it) {
+                encoder->encode(it->first);
+                encoder->encode(Owner(it->second.get()));
+            }
             return true;
         }
@@ -71 +87 @@
 // Handles
 //   - Array -> Array
+//   - Dictionary -> Dictionary
 //   - String -> String
 
@@ -94 +111 @@
 
             coder.m_root = ImmutableArray::adopt(vector);
+            break;
+        }
+        case APIObject::TypeDictionary: {
+            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<APIObject> element;
+                Owner messageCoder(coder, element);
+                if (!decoder->decode(messageCoder))
+                    return false;
+
+                std::pair<ImmutableDictionary::MapType::iterator, bool> result = map.set(key, element.release());
+                if (!result.second)
+                    return false;
+            }
+
+            coder.m_root = ImmutableDictionary::adopt(map);
             break;
         }