Changeset 88870 in webkit

Timestamp:

Jun 14, 2011 4:25:45 PM (13 years ago)

Author:

andersca@apple.com

Message:

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

Reviewed by Sam Weinig.

Start using the new encode/decode functions
​https://bugs.webkit.org/show_bug.cgi?id=62676

• Platform/CoreIPC/DataReference.cpp: (CoreIPC::DataReference::encode): Use encodeVariableLengthByteArray.

• Shared/UserMessageCoders.h: (WebKit::UserMessageEncoder::baseEncode): Use encodeVariableLengthByteArray and the new dataReference accessors.

(WebKit::UserMessageDecoder::baseDecode):
Use decodeVariableLengthByteArray.

• Shared/WebData.h: (WebKit::WebData::dataReference): Return a reference to the data.

• Shared/WebSerializedScriptValue.h: (WebKit::WebSerializedScriptValue::dataReference): Ditto.

• Shared/cf/ArgumentCodersCF.cpp: (CoreIPC::encode): Use encodeVariableLengthByteArray.

• Shared/mac/SandboxExtensionMac.mm: (WebKit::SandboxExtension::Handle::encode): Use encodeVariableLengthByteArray.

• WebProcess/WebPage/DecoderAdapter.cpp: (WebKit::DecoderAdapter::decodeBytes): Use decodeVariableLengthByteArray.

• WebProcess/WebPage/EncoderAdapter.cpp: (WebKit::EncoderAdapter::dataReference): Rename data() to dataReference() to indicate that it returns a reference to the data.

(WebKit::EncoderAdapter::encodeBytes):
Use encodeVariableLengthByteArray.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/DataReference.cpp (modified) (1 diff)
• Shared/UserMessageCoders.h (modified) (5 diffs)
• Shared/WebData.h (modified) (2 diffs)
• Shared/WebSerializedScriptValue.h (modified) (2 diffs)
• Shared/cf/ArgumentCodersCF.cpp (modified) (3 diffs)
• Shared/mac/SandboxExtensionMac.mm (modified) (2 diffs)
• WebProcess/WebPage/DecoderAdapter.cpp (modified) (2 diffs)
• WebProcess/WebPage/EncoderAdapter.cpp (modified) (2 diffs)
• WebProcess/WebPage/EncoderAdapter.h (modified) (1 diff)
• WebProcess/WebPage/WebBackForwardListProxy.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-14  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Start using the new encode/decode functions
+        https://bugs.webkit.org/show_bug.cgi?id=62676
+
+        * Platform/CoreIPC/DataReference.cpp:
+        (CoreIPC::DataReference::encode):
+        Use encodeVariableLengthByteArray.
+
+        * Shared/UserMessageCoders.h:
+        (WebKit::UserMessageEncoder::baseEncode):
+        Use encodeVariableLengthByteArray and the new dataReference accessors.
+
+        (WebKit::UserMessageDecoder::baseDecode):
+        Use decodeVariableLengthByteArray.
+ 
+        * Shared/WebData.h:
+        (WebKit::WebData::dataReference):
+        Return a reference to the data.
+
+        * Shared/WebSerializedScriptValue.h:
+        (WebKit::WebSerializedScriptValue::dataReference):
+        Ditto.
+
+        * Shared/cf/ArgumentCodersCF.cpp:
+        (CoreIPC::encode):
+        Use encodeVariableLengthByteArray.
+
+        * Shared/mac/SandboxExtensionMac.mm:
+        (WebKit::SandboxExtension::Handle::encode):
+        Use encodeVariableLengthByteArray.
+
+        * WebProcess/WebPage/DecoderAdapter.cpp:
+        (WebKit::DecoderAdapter::decodeBytes):
+        Use decodeVariableLengthByteArray.
+
+        * WebProcess/WebPage/EncoderAdapter.cpp:
+        (WebKit::EncoderAdapter::dataReference):
+        Rename data() to dataReference() to indicate that it returns a reference to the data.
+
+        (WebKit::EncoderAdapter::encodeBytes):
+        Use encodeVariableLengthByteArray.
+
 2011-06-14  Anders Carlsson  <andersca@apple.com>
 

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

@@ -34 +34 @@
 void DataReference::encode(ArgumentEncoder* encoder) const
 {
-    encoder->encodeBytes(m_data, m_size);
+    encoder->encodeVariableLengthByteArray(*this);
 }
 

trunk/Source/WebKit2/Shared/UserMessageCoders.h

@@ -29 +29 @@
 #include "ArgumentDecoder.h"
 #include "ArgumentEncoder.h"
+#include "DataReference.h"
 #include "ImmutableArray.h"
 #include "ImmutableDictionary.h"
@@ -98 +99 @@
         case APIObject::TypeSerializedScriptValue: {
             WebSerializedScriptValue* scriptValue = static_cast<WebSerializedScriptValue*>(m_root);
-            encoder->encodeBytes(scriptValue->data().data(), scriptValue->data().size());
+            encoder->encodeVariableLengthByteArray(scriptValue->dataReference());
             return true;
         }
@@ -144 +145 @@
         case APIObject::TypeData: {
             WebData* data = static_cast<WebData*>(m_root);
-            encoder->encodeBytes(data->bytes(), data->size());
+            encoder->encodeVariableLengthByteArray(data->dataReference());
             return true;
         }
@@ -244 +245 @@
         }
         case APIObject::TypeSerializedScriptValue: {
-            Vector<uint8_t> buffer;
-            if (!decoder->decodeBytes(buffer))
-                return false;
-            coder.m_root = WebSerializedScriptValue::adopt(buffer);
+            CoreIPC::DataReference dataReference;
+            if (!decoder->decodeVariableLengthByteArray(dataReference))
+                return false;
+            
+            Vector<uint8_t> vector = dataReference.vector();
+            coder.m_root = WebSerializedScriptValue::adopt(vector);
             break;
         }
@@ -301 +304 @@
         }
         case APIObject::TypeData: {
-            Vector<uint8_t> buffer;
-            if (!decoder->decodeBytes(buffer))
-                return false;
-            coder.m_root = WebData::create(buffer);
+            CoreIPC::DataReference dataReference;
+            if (!decoder->decodeVariableLengthByteArray(dataReference))
+                return false;
+            coder.m_root = WebData::create(dataReference.data(), dataReference.size());
             break;
         }

trunk/Source/WebKit2/Shared/WebData.h

@@ -28 +28 @@
 
 #include "APIObject.h"
+#include "DataReference.h"
 #include <wtf/Forward.h>
 #include <wtf/Vector.h>
@@ -71 +72 @@
     size_t size() const { return m_size; }
 
+    CoreIPC::DataReference dataReference() const { return CoreIPC::DataReference(m_bytes, m_size); }
+
 private:
     WebData(const unsigned char* bytes, size_t size, FreeDataFunction freeDataFunction, const void* context)

trunk/Source/WebKit2/Shared/WebSerializedScriptValue.h

@@ -29 +29 @@
 #include "APIObject.h"
 
+#include "DataReference.h"
 #include <WebCore/SerializedScriptValue.h>
 #include <wtf/RefPtr.h>
@@ -60 +61 @@
         return m_serializedScriptValue->deserialize(context, exception);
     }
-    
-    const Vector<uint8_t>& data() { return m_serializedScriptValue->data(); }
+
+    CoreIPC::DataReference dataReference() const { return m_serializedScriptValue->data(); }
 
     void* internalRepresentation() { return m_serializedScriptValue.get(); }

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

@@ -292 +292 @@
     const UInt8* bytePtr = CFDataGetBytePtr(data);
 
-    encoder->encodeBytes(bytePtr, length);
+    encoder->encodeVariableLengthByteArray(CoreIPC::DataReference(bytePtr, length));
 }
 
@@ -377 +377 @@
 
     encoder->encodeEnum(numberType);
-    encoder->encodeBytes(buffer.data(), buffer.size());
+    encoder->encodeVariableLengthByteArray(buffer);
 }
 
@@ -465 +465 @@
 
     encoder->encodeEnum(encoding);
-    encoder->encodeBytes(buffer.data(), bufferLength);
+    encoder->encodeVariableLengthByteArray(buffer);
 }
 

trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm

@@ -57 +57 @@
 {
     if (!m_sandboxExtension) {
-        encoder->encodeBytes(0, 0);
+        encoder->encodeVariableLengthByteArray(CoreIPC::DataReference());
         return;
     }
@@ -65 +65 @@
     ASSERT(serializedFormat);
 
-    encoder->encodeBytes(reinterpret_cast<const uint8_t*>(serializedFormat), length);
+    encoder->encodeVariableLengthByteArray(CoreIPC::DataReference(reinterpret_cast<const uint8_t*>(serializedFormat), length));
 
     // Encoding will destroy the sandbox extension locally.

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

@@ -27 +27 @@
 #include "DecoderAdapter.h"
 
+#include "DataReference.h"
 #include "WebCoreArgumentCoders.h"
 
@@ -38 +39 @@
 bool DecoderAdapter::decodeBytes(Vector<uint8_t>& bytes)
 {
-    return m_decoder.decodeBytes(bytes);
+    CoreIPC::DataReference dataReference;
+    if (!m_decoder.decodeVariableLengthByteArray(dataReference))
+        return false;
+
+    bytes = dataReference.vector();
+    return true;
 }
 

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

@@ -37 +37 @@
 }
 
-CoreIPC::DataReference EncoderAdapter::data() const
+CoreIPC::DataReference EncoderAdapter::dataReference() const
 {
     return CoreIPC::DataReference(m_encoder->buffer(), m_encoder->bufferSize());
@@ -44 +44 @@
 void EncoderAdapter::encodeBytes(const uint8_t* bytes, size_t size)
 {
-    m_encoder->encodeBytes(bytes, size);
+    m_encoder->encodeVariableLengthByteArray(CoreIPC::DataReference(bytes, size));
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.h

@@ -42 +42 @@
     EncoderAdapter();
 
-    CoreIPC::DataReference data() const;
+    CoreIPC::DataReference dataReference() const;
 
 private:

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

@@ -89 +89 @@
     item->encodeBackForwardTree(encoder);
 
-    WebProcess::shared().connection()->send(Messages::WebProcessProxy::AddBackForwardItem(itemID,
-        item->originalURLString(), item->urlString(), item->title(), encoder.data()), 0);
+    WebProcess::shared().connection()->send(Messages::WebProcessProxy::AddBackForwardItem(itemID, item->originalURLString(), item->urlString(), item->title(), encoder.dataReference()), 0);
 }