Changeset 170645 in webkit

Timestamp:

Jul 1, 2014, 10:14:35 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Add encodeInteger and decodeInteger for remote object encoder and decoder.
​https://bugs.webkit.org/show_bug.cgi?id=134453

In 64bit system, encodeInteger/decodeInteger is by default mapped into encodeInt64/decodeInt64. For
32bit system, they are mapped to encodeInt32/decodeInt32. However, since we don't have encodeInt32/decodeInt32
implementation in WKRemoteObjectCoder, we could hit crash in 32bit systems.

Patch by Yongjun Zhang <​yongjun_zhang@apple.com> on 2014-07-01
Reviewed by Sam Weinig.

• Shared/API/Cocoa/WKRemoteObjectCoder.mm:

(-[WKRemoteObjectEncoder encodeInteger:forKey:]): Instead of creating a new number type UInt32, use encodeInt64 for

encoding NSInteger.

(-[WKRemoteObjectDecoder decodeIntegerForKey:]):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-01  Yongjun Zhang  <yongjun_zhang@apple.com>
+
+        Add encodeInteger and decodeInteger for remote object encoder and decoder.
+        https://bugs.webkit.org/show_bug.cgi?id=134453
+
+        In 64bit system, encodeInteger/decodeInteger is by default mapped into encodeInt64/decodeInt64.  For
+        32bit system, they are mapped to encodeInt32/decodeInt32.  However, since we don't have encodeInt32/decodeInt32
+        implementation in WKRemoteObjectCoder, we could hit crash in 32bit systems.
+
+        Reviewed by Sam Weinig.
+
+        * Shared/API/Cocoa/WKRemoteObjectCoder.mm:
+        (-[WKRemoteObjectEncoder encodeInteger:forKey:]): Instead of creating a new number type UInt32, use encodeInt64 for
+            encoding NSInteger.
+        (-[WKRemoteObjectDecoder decodeIntegerForKey:]):
+
 2014-06-30  Anders Carlsson  <andersca@apple.com>
 

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

@@ -296 +296 @@
 }
 
+- (void)encodeInteger:(NSInteger)intv forKey:(NSString *)key
+{
+    return [self encodeInt64:intv forKey:key];
+}
+
 - (void)encodeDouble:(double)value forKey:(NSString *)key
 {
@@ -576 +581 @@
 }
 
+- (NSInteger)decodeIntegerForKey:(NSString *)key
+{
+    return [self decodeInt64ForKey:key];
+}
+
 - (double)decodeDoubleForKey:(NSString *)key
 {