Changeset 158980 in webkit

Timestamp:

Nov 8, 2013 5:16:26 PM (10 years ago)

Author:

andersca@apple.com

Message:

Implement more KeyedEncoder functionality
​https://bugs.webkit.org/show_bug.cgi?id=124089

Reviewed by Beth Dakin.

Source/WebCore:

• bindings/js/SerializedScriptValue.h:
• history/HistoryItem.cpp:

(WebCore::HistoryItem::encodeBackForwardTreeNode):

• platform/KeyedCoding.h:

(WebCore::KeyedEncoder::encodeConditionalObject):

Source/WebKit2:

• Shared/cf/KeyedEncoder.cpp:

(WebKit::KeyedEncoder::encodeBytes):
(WebKit::KeyedEncoder::encodeInt32):
(WebKit::KeyedEncoder::encodeFloat):

• Shared/cf/KeyedEncoder.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/SerializedScriptValue.h (modified) (1 diff)
• WebCore/history/HistoryItem.cpp (modified) (1 diff)
• WebCore/platform/KeyedCoding.h (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/cf/KeyedEncoder.cpp (modified) (1 diff)
• WebKit2/Shared/cf/KeyedEncoder.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-11-08  Anders Carlsson  <andersca@apple.com>
+
+        Implement more KeyedEncoder functionality
+        https://bugs.webkit.org/show_bug.cgi?id=124089
+
+        Reviewed by Beth Dakin.
+
+        * bindings/js/SerializedScriptValue.h:
+        * history/HistoryItem.cpp:
+        (WebCore::HistoryItem::encodeBackForwardTreeNode):
+        * platform/KeyedCoding.h:
+        (WebCore::KeyedEncoder::encodeConditionalObject):
+
 2013-11-08  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/bindings/js/SerializedScriptValue.h

@@ -96 +96 @@
 #endif
 
-    const Vector<uint8_t>& data() { return m_data; }
+    const Vector<uint8_t>& data() const { return m_data; }
     const Vector<String>& blobURLs() const { return m_blobURLs; }
 

trunk/Source/WebCore/history/HistoryItem.cpp

@@ -740 +740 @@
     // FIXME: Implement.
 
+    encoder.encodeString("formContentType", m_formContentType);
+
+    encoder.encodeConditionalObject("formData", m_formData.get(), [](KeyedEncoder&, const FormData&) {
+        // FIXME: Implement.
+    });
+
+    encoder.encodeString("referrer", m_referrer);
+
+    encoder.encodeObject("scrollPoint", m_scrollPoint, [](KeyedEncoder& encoder, const IntPoint& scrollPoint) {
+        encoder.encodeInt32("x", scrollPoint.x());
+        encoder.encodeInt32("y", scrollPoint.y());
+    });
+
+    encoder.encodeFloat("pageScaleFactor", m_pageScaleFactor);
+
+    encoder.encodeConditionalObject("stateObject", m_stateObject.get(), [](KeyedEncoder& encoder, const SerializedScriptValue& stateObject) {
+        encoder.encodeBytes("data", stateObject.data().data(), stateObject.data().size());
+    });
+
     encoder.encodeString("target", m_target);
 }

trunk/Source/WebCore/platform/KeyedCoding.h

@@ -36 +36 @@
 
 public:
+    virtual void encodeBytes(const String& key, const uint8_t*, size_t) = 0;
     virtual void encodeUInt32(const String& key, uint32_t) = 0;
-
+    virtual void encodeInt32(const String& key, int32_t) = 0;
+    virtual void encodeFloat(const String& key, float) = 0;
     virtual void encodeString(const String& key, const String&) = 0;
 
@@ -48 +50 @@
     }
 
+    template<typename T, typename F>
+    void encodeConditionalObject(const String& key, const T* object, F&& function)
+    {
+        if (!object)
+            return;
+
+        encodeObject(key, *object, std::forward<F>(function));
+    }
+
 private:
     virtual void beginObject(const String& key) = 0;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-11-08  Anders Carlsson  <andersca@apple.com>
+
+        Implement more KeyedEncoder functionality
+        https://bugs.webkit.org/show_bug.cgi?id=124089
+
+        Reviewed by Beth Dakin.
+
+        * Shared/cf/KeyedEncoder.cpp:
+        (WebKit::KeyedEncoder::encodeBytes):
+        (WebKit::KeyedEncoder::encodeInt32):
+        (WebKit::KeyedEncoder::encodeFloat):
+        * Shared/cf/KeyedEncoder.h:
+
 2013-11-08  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/cf/KeyedEncoder.cpp

@@ -49 +49 @@
 }
 
+void KeyedEncoder::encodeBytes(const String& key, const uint8_t* bytes, size_t size)
+{
+    RetainPtr<CFDataRef> data = adoptCF(CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, bytes, size, kCFAllocatorNull));
+    CFDictionarySetValue(m_dictionaryStack.last(), key.createCFString().get(), data.get());
+}
+
 void KeyedEncoder::encodeUInt32(const String& key, uint32_t value)
 {
     RetainPtr<CFNumberRef> number = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &value));
+    CFDictionarySetValue(m_dictionaryStack.last(), key.createCFString().get(), number.get());
+}
+
+void KeyedEncoder::encodeInt32(const String& key, int32_t value)
+{
+    RetainPtr<CFNumberRef> number = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &value));
+    CFDictionarySetValue(m_dictionaryStack.last(), key.createCFString().get(), number.get());
+}
+
+void KeyedEncoder::encodeFloat(const String& key, float value)
+{
+    RetainPtr<CFNumberRef> number = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberFloatType, &value));
     CFDictionarySetValue(m_dictionaryStack.last(), key.createCFString().get(), number.get());
 }

trunk/Source/WebKit2/Shared/cf/KeyedEncoder.h

@@ -39 +39 @@
 
 private:
+    virtual void encodeBytes(const String& key, const uint8_t*, size_t) OVERRIDE;
+
     virtual void encodeUInt32(const String& key, uint32_t) OVERRIDE;
+    virtual void encodeInt32(const String& key, int32_t) OVERRIDE;
+    virtual void encodeFloat(const String& key, float) OVERRIDE;
     virtual void encodeString(const String& key, const String&) OVERRIDE;