Changeset 158784 in webkit

Timestamp:

Nov 6, 2013 1:52:54 PM (10 years ago)

Author:

andersca@apple.com

Message:

Implement more decoding methods
​https://bugs.webkit.org/show_bug.cgi?id=123922

Reviewed by Dan Bernstein.

• Shared/API/Cocoa/WKRemoteObjectCoder.mm:

(-[WKRemoteObjectDecoder decodeObjectForKey:]):
Call decodeObjectOfClasses:forKey: passing nil as the classes set.

(-[WKRemoteObjectDecoder decodeInt64ForKey:]):
Try to get a WebUInt64 and return its value.

(-[WKRemoteObjectDecoder decodeDoubleForKey:]):
Try to get a WebDouble and return its value.

(-[WKRemoteObjectDecoder decodeBytesForKey:returnedLength:]):
Move this method next to the other decoding methods.

(-[WKRemoteObjectDecoder requiresSecureCoding]):
Ditto.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/Cocoa/WKRemoteObjectCoder.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-11-06  Anders Carlsson  <andersca@apple.com>
+
+        Implement more decoding methods
+        https://bugs.webkit.org/show_bug.cgi?id=123922
+
+        Reviewed by Dan Bernstein.
+
+        * Shared/API/Cocoa/WKRemoteObjectCoder.mm:
+        (-[WKRemoteObjectDecoder decodeObjectForKey:]):
+        Call decodeObjectOfClasses:forKey: passing nil as the classes set.
+
+        (-[WKRemoteObjectDecoder decodeInt64ForKey:]):
+        Try to get a WebUInt64 and return its value.
+
+        (-[WKRemoteObjectDecoder decodeDoubleForKey:]):
+        Try to get a WebDouble and return its value.
+
+        (-[WKRemoteObjectDecoder decodeBytesForKey:returnedLength:]):
+        Move this method next to the other decoding methods.
+
+        (-[WKRemoteObjectDecoder requiresSecureCoding]):
+        Ditto.
+
 2013-11-06  Brendan Long  <b.long@cablelabs.com>
 

trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm

@@ -290 +290 @@
 }
 
-- (const uint8_t *)decodeBytesForKey:(NSString *)key returnedLength:(NSUInteger *)length
-{
-    WebData* data = _currentDictionary->get<WebData>(escapeKey(key));
-    if (!data || !data->size())
-        return nullptr;
-
-    *length = data->size();
-    return data->bytes();
-}
-
-- (BOOL)requiresSecureCoding
-{
-    return YES;
+- (id)decodeObjectForKey:(NSString *)key
+{
+    return [self decodeObjectOfClasses:nil forKey:key];
 }
 
@@ -464 +454 @@
 }
 
+- (int64_t)decodeInt64ForKey:(NSString *)key
+{
+    const WebUInt64* value = _currentDictionary->get<WebUInt64>(escapeKey(key));
+    if (!value)
+        return 0;
+    return value->value();
+}
+
+- (double)decodeDoubleForKey:(NSString *)key
+{
+    const WebDouble* value = _currentDictionary->get<WebDouble>(escapeKey(key));
+    if (!value)
+        return 0;
+    return value->value();
+}
+
+- (const uint8_t *)decodeBytesForKey:(NSString *)key returnedLength:(NSUInteger *)length
+{
+    WebData* data = _currentDictionary->get<WebData>(escapeKey(key));
+    if (!data || !data->size())
+        return nullptr;
+
+    *length = data->size();
+    return data->bytes();
+}
+
+- (BOOL)requiresSecureCoding
+{
+    return YES;
+}
+
 - (id)decodeObjectOfClasses:(NSSet *)classes forKey:(NSString *)key
 {