Changeset 160657 in webkit

Timestamp:

Dec 16, 2013 12:47:00 PM (10 years ago)

Author:

andersca@apple.com

Message:

UserData should encode and decode API::Data objects
​https://bugs.webkit.org/show_bug.cgi?id=125799

Reviewed by Beth Dakin.

• Shared/APIData.cpp: Added.

(API::Data::encode):
(API::Data::decode):

• Shared/APIData.h:
• Shared/UserData.cpp:

(WebKit::UserData::encode):
(WebKit::UserData::decode):

• WebKit2.xcodeproj/project.pbxproj:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/APIData.cpp (added)
• Shared/APIData.h (modified) (2 diffs)
• Shared/UserData.cpp (modified) (3 diffs)
• WebKit2.xcodeproj/project.pbxproj (modified) (6 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-16  Anders Carlsson  <andersca@apple.com>
+
+        UserData should encode and decode API::Data objects
+        https://bugs.webkit.org/show_bug.cgi?id=125799
+
+        Reviewed by Beth Dakin.
+
+        * Shared/APIData.cpp: Added.
+        (API::Data::encode):
+        (API::Data::decode):
+        * Shared/APIData.h:
+        * Shared/UserData.cpp:
+        (WebKit::UserData::encode):
+        (WebKit::UserData::decode):
+        * WebKit2.xcodeproj/project.pbxproj:
+
 2013-12-16  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/APIData.h

@@ -31 +31 @@
 #include <wtf/Forward.h>
 #include <wtf/Vector.h>
+
+namespace IPC {
+class ArgumentDecoder;
+class ArgumentEncoder;
+}
 
 namespace API {
@@ -70 +75 @@
     IPC::DataReference dataReference() const { return IPC::DataReference(m_bytes, m_size); }
 
+    void encode(IPC::ArgumentEncoder&) const;
+    static bool decode(IPC::ArgumentDecoder&, RefPtr<API::Object>&);
+
 private:
     Data(const unsigned char* bytes, size_t size, FreeDataFunction freeDataFunction, const void* context)

trunk/Source/WebKit2/Shared/UserData.cpp

@@ -28 +28 @@
 
 #include "APIArray.h"
+#include "APIData.h"
 #include "APIFrameHandle.h"
 #include "APIGeometry.h"
@@ -119 +120 @@
         break;
 
+    case API::Object::Type::Data:
+        static_cast<const API::Data&>(object).encode(encoder);
+        break;
+    
     case API::Object::Type::Dictionary: {
         auto& dictionary = static_cast<const ImmutableDictionary&>(object);
@@ -204 +209 @@
         break;
 
+    case API::Object::Type::Data:
+        if (!API::Data::decode(decoder, result))
+            return false;
+        break;
+
     case API::Object::Type::Dictionary: {
         uint64_t size;

trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -225 +225 @@
                 1AAB0379185A7C6A00EDF501 /* MessageSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAB0377185A7C6A00EDF501 /* MessageSender.cpp */; };
                 1AAB037A185A7C6A00EDF501 /* MessageSender.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAB0378185A7C6A00EDF501 /* MessageSender.h */; };
+                1AAB037C185F99D800EDF501 /* APIData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAB037B185F99D800EDF501 /* APIData.cpp */; };
                 1AAB4A8D1296F0A20023952F /* SandboxExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAB4A8C1296F0A20023952F /* SandboxExtension.h */; };
                 1AAB4AAA1296F1540023952F /* SandboxExtensionMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AAB4AA91296F1540023952F /* SandboxExtensionMac.mm */; };
@@ -1774 +1775 @@
                 1AAB0377185A7C6A00EDF501 /* MessageSender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MessageSender.cpp; sourceTree = "<group>"; };
                 1AAB0378185A7C6A00EDF501 /* MessageSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageSender.h; sourceTree = "<group>"; };
+                1AAB037B185F99D800EDF501 /* APIData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIData.cpp; sourceTree = "<group>"; };
                 1AAB4A8C1296F0A20023952F /* SandboxExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SandboxExtension.h; sourceTree = "<group>"; };
                 1AAB4AA91296F1540023952F /* SandboxExtensionMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SandboxExtensionMac.mm; sourceTree = "<group>"; };
@@ -3469 +3471 @@
                                 BC64696E11DBE603006455B0 /* APIArray.h */,
                                 1A3DD205125E5A2F004515E6 /* APIClient.h */,
+                                1AAB037B185F99D800EDF501 /* APIData.cpp */,
                                 51578B821209ECEF00A37C4A /* APIData.h */,
                                 1AC1336F18566C7C00F3EC05 /* APIFrameHandle.cpp */,
@@ -3479 +3482 @@
                                 1AC1336D18565D2B00F3EC05 /* APIPageHandle.cpp */,
                                 1AC1336B18565C7A00F3EC05 /* APIPageHandle.h */,
+                                BCF04C8E11FF9F6E00F86A58 /* APIString.h */,
                                 A7D792D51767CB6E00881CBE /* ActivityAssertion.cpp */,
                                 A7D792D41767CB0900881CBE /* ActivityAssertion.h */,
@@ -3606 +3610 @@
                                 F634445512A885C8000612D8 /* WebSecurityOrigin.h */,
                                 A72D5D7F1236CBA800A88B15 /* WebSerializedScriptValue.h */,
-                                BCF04C8E11FF9F6E00F86A58 /* APIString.h */,
                                 C0337DD7127A51B6008FF4F4 /* WebTouchEvent.cpp */,
                                 BCDB86C01200FB97007254BE /* WebURL.h */,
@@ -7135 +7138 @@
                                 755422CB180650020046F6A8 /* WebOriginDataManager.cpp in Sources */,
                                 BCA8C6A811E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.cpp in Sources */,
+                                1AAB037C185F99D800EDF501 /* APIData.cpp in Sources */,
                                 BC8147AA12F64CDA007B2C32 /* InjectedBundlePagePolicyClient.cpp in Sources */,
                                 659C551E130006410025C0C2 /* InjectedBundlePageResourceLoadClient.cpp in Sources */,