Title: [187331] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 187331
- Author
- [email protected]
- Date
- 2015-07-24 00:55:01 -0700 (Fri, 24 Jul 2015)
Log Message
Merge r187288. rdar://problem/21929532
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187330 => 187331)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 07:54:58 UTC (rev 187330)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 07:55:01 UTC (rev 187331)
@@ -1,5 +1,21 @@
2015-07-24 Matthew Hanson <[email protected]>
+ Merge r187288. rdar://problem/21929532
+
+ 2015-07-23 Dan Bernstein <[email protected]>
+
+ <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-24 Matthew Hanson <[email protected]>
+
Merge r187286. rdar://problem/21953359
2015-07-23 Zalan Bujtas <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm (187330 => 187331)
--- branches/safari-601.1-branch/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm 2015-07-24 07:54:58 UTC (rev 187330)
+++ branches/safari-601.1-branch/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm 2015-07-24 07:55:01 UTC (rev 187331)
@@ -241,7 +241,7 @@
return;
}
- if ([object isKindOfClass:[NSString class]]) {
+ if (objectClass == [NSString class] || objectClass == [NSMutableString class]) {
encodeString(encoder, object);
return;
}
@@ -586,6 +586,9 @@
if (objectClass == [NSString class])
return decodeString(decoder);
+ if (objectClass == [NSMutableString class])
+ return [NSMutableString stringWithString:decodeString(decoder)];
+
id result = [objectClass allocWithZone:decoder.zone];
if (!result)
[NSException raise:NSInvalidUnarchiveOperationException format:@"Class \"%s\" returned nil from +alloc while being decoded", className.data()];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
