Changeset 187288 in webkit

Timestamp:

Jul 23, 2015 9:53:26 PM (9 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/21929532> REGRESSION (r184026): Safari AutoFill with Contact info for phone number is broken
​https://bugs.webkit.org/show_bug.cgi?id=147249

Reviewed by Sam Weinig.

• Shared/API/Cocoa/WKRemoteObjectCoder.mm:

(encodeObject): Use encodeString only for strings that encode as NSString or
NSMutableString. It can’t encode arbitrary NSString subclasses.
(decodeObject): Use decodeString for NSMutableString as well.

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-23  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/21929532> REGRESSION (r184026): Safari AutoFill with Contact info for phone number is broken
+        https://bugs.webkit.org/show_bug.cgi?id=147249
+
+        Reviewed by Sam Weinig.
+
+        * Shared/API/Cocoa/WKRemoteObjectCoder.mm:
+        (encodeObject): Use encodeString only for strings that encode as NSString or
+        NSMutableString. It can’t encode arbitrary NSString subclasses.
+        (decodeObject): Use decodeString for NSMutableString as well.
+
 2015-07-23  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -242 +242 @@
     }
 
-    if ([object isKindOfClass:[NSString class]]) {
+    if (objectClass == [NSString class] || objectClass == [NSMutableString class]) {
         encodeString(encoder, object);
         return;
@@ -587 +587 @@
         return decodeString(decoder);
 
+    if (objectClass == [NSMutableString class])
+        return [NSMutableString stringWithString:decodeString(decoder)];
+
     id result = [objectClass allocWithZone:decoder.zone];
     if (!result)