Title: [158772] trunk/Source/WebKit2
Revision
158772
Author
[email protected]
Date
2013-11-06 12:31:40 -0800 (Wed, 06 Nov 2013)

Log Message

Encode parameters as objects
https://bugs.webkit.org/show_bug.cgi?id=123912

Reviewed by Beth Dakin.

We want to ensure that the objects have the right types when decoded, so just encode them as objects.

* Shared/API/Cocoa/WKRemoteObjectCoder.mm:
(encodeInvocation):
(-[WKRemoteObjectEncoder encodeValueOfObjCType:at:]):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (158771 => 158772)


--- trunk/Source/WebKit2/ChangeLog	2013-11-06 20:27:11 UTC (rev 158771)
+++ trunk/Source/WebKit2/ChangeLog	2013-11-06 20:31:40 UTC (rev 158772)
@@ -1,3 +1,16 @@
+2013-11-06  Anders Carlsson  <[email protected]>
+
+        Encode parameters as objects
+        https://bugs.webkit.org/show_bug.cgi?id=123912
+
+        Reviewed by Beth Dakin.
+
+        We want to ensure that the objects have the right types when decoded, so just encode them as objects.
+
+        * Shared/API/Cocoa/WKRemoteObjectCoder.mm:
+        (encodeInvocation):
+        (-[WKRemoteObjectEncoder encodeValueOfObjCType:at:]):
+
 2013-11-06  Sam Weinig  <[email protected]>
 
         Add WKBrowsingContextPolicyDelegate

Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm (158771 => 158772)


--- trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm	2013-11-06 20:27:11 UTC (rev 158771)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm	2013-11-06 20:31:40 UTC (rev 158772)
@@ -100,20 +100,6 @@
     encoder->_rootDictionary->set(objectStreamKey, objectStream.release());
 }
 
-static void encodeToObjectStream(WKRemoteObjectEncoder *encoder, double value)
-{
-    ensureObjectStream(encoder);
-
-    encoder->_objectStream->append(WebDouble::create(value));
-}
-
-static void encodeToObjectStream(WKRemoteObjectEncoder *encoder, int value)
-{
-    ensureObjectStream(encoder);
-
-    encoder->_objectStream->append(WebUInt64::create(value));
-}
-
 static void encodeToObjectStream(WKRemoteObjectEncoder *encoder, id value)
 {
     ensureObjectStream(encoder);
@@ -142,7 +128,7 @@
             double value;
             [invocation getArgument:&value atIndex:i];
 
-            encodeToObjectStream(encoder, value);
+            encodeToObjectStream(encoder, @(value));
             break;
         }
 
@@ -151,7 +137,7 @@
             int value;
             [invocation getArgument:&value atIndex:i];
 
-            encodeToObjectStream(encoder, value);
+            encodeToObjectStream(encoder, @(value));
             break;
         }
 
@@ -213,7 +199,7 @@
     switch (*type) {
     // int
     case 'i':
-        encodeToObjectStream(self, *static_cast<const int*>(address));
+        encodeToObjectStream(self, @(*static_cast<const int*>(address)));
         break;
 
     // Objective-C object.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to