Changeset 88860 in webkit

Timestamp:

Jun 14, 2011 3:57:22 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-06-14 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Add functions for converting between DataReferences and vectors
​https://bugs.webkit.org/show_bug.cgi?id=62671

• Platform/CoreIPC/DataReference.h: (CoreIPC::DataReference::DataReference): New implicit constructor that takes a vector.

(CoreIPC::DataReference::vector):
New function that returns a new vector.

• Shared/WebBackForwardListItem.cpp: (WebKit::WebBackForwardListItem::encode): Use implicit constructor.

• WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::runJavaScriptInMainFrame): Ditto.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/DataReference.h (modified) (3 diffs)
• Shared/WebBackForwardListItem.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-14  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Add functions for converting between DataReferences and vectors
+        https://bugs.webkit.org/show_bug.cgi?id=62671
+
+        * Platform/CoreIPC/DataReference.h:
+        (CoreIPC::DataReference::DataReference):
+        New implicit constructor that takes a vector.
+
+        (CoreIPC::DataReference::vector):
+        New function that returns a new vector.
+
+        * Shared/WebBackForwardListItem.cpp:
+        (WebKit::WebBackForwardListItem::encode):
+        Use implicit constructor.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::runJavaScriptInMainFrame):
+        Ditto.
+
 2011-06-14  John Sullivan  <sullivan@apple.com>
 

trunk/Source/WebKit2/Platform/CoreIPC/DataReference.h

@@ -27 +27 @@
 #define DataReference_h
 
-#include <inttypes.h>
+#include <wtf/Vector.h>
 
 namespace CoreIPC {
@@ -48 +48 @@
     }
 
+    template<size_t inlineCapacity>
+    DataReference(const Vector<uint8_t, inlineCapacity>& vector)
+        : m_data(vector.data())
+        , m_size(vector.size())
+    {
+    }
+
     bool isEmpty() const { return size() == 0; }
 
@@ -56 +63 @@
             return 0;
         return m_data; 
+    }
+
+    Vector<uint8_t> vector()
+    {
+        Vector<uint8_t> result;
+        result.append(m_data, m_size);
+
+        return result;
     }
 

trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp

@@ -68 +68 @@
     encoder.encode(m_title);
     encoder.encode(m_itemID);
-    encoder.encode(CoreIPC::DataReference(m_backForwardData.data(), m_backForwardData.size()));
+    encoder.encode(CoreIPC::DataReference(m_backForwardData));
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -1417 +1417 @@
     JSLock lock(SilenceAssertionsOnly);
     if (JSValue resultValue = m_mainFrame->coreFrame()->script()->executeScript(script, true).jsValue()) {
-        if ((serializedResultValue = SerializedScriptValue::create(m_mainFrame->jsContext(), 
-            toRef(m_mainFrame->coreFrame()->script()->globalObject(mainThreadNormalWorld())->globalExec(), resultValue), 0)))
-            dataReference = CoreIPC::DataReference(serializedResultValue->data().data(), serializedResultValue->data().size());
+        if ((serializedResultValue = SerializedScriptValue::create(m_mainFrame->jsContext(), toRef(m_mainFrame->coreFrame()->script()->globalObject(mainThreadNormalWorld())->globalExec(), resultValue), 0)))
+            dataReference = serializedResultValue->data();
     }