Title: [187041] branches/safari-600.1.4.17-branch/Source/WebKit2
- Revision
- 187041
- Author
- lforsch...@apple.com
- Date
- 2015-07-20 15:52:25 -0700 (Mon, 20 Jul 2015)
Log Message
Merged r186812. rdar://problem/21877914
Modified Paths
Diff
Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog (187040 => 187041)
--- branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog 2015-07-20 22:36:18 UTC (rev 187040)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog 2015-07-20 22:52:25 UTC (rev 187041)
@@ -1,3 +1,20 @@
+2015-07-20 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r186812
+
+ 2015-07-14 Sam Weinig <s...@webkit.org>
+
+ WebKit needs to serialize numeric values in NSError userInfo
+ <rdar://problem/21818117>
+ https://bugs.webkit.org/show_bug.cgi?id=146936
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/mac/WebCoreArgumentCodersMac.mm:
+ (IPC::ArgumentCoder<ResourceError>::encodePlatformData):
+ Encode userInfo values that are NSNumbers in addition to NSStrings and NSURLs. Decoding
+ is already handled.
+
2015-07-17 Andy Estes <aes...@apple.com>
Merge r186982. rdar://problem/21709404
Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (187040 => 187041)
--- branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2015-07-20 22:36:18 UTC (rev 187040)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2015-07-20 22:52:25 UTC (rev 187041)
@@ -229,7 +229,7 @@
RetainPtr<CFMutableDictionaryRef> filteredUserInfo = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, userInfo.count, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
[userInfo enumerateKeysAndObjectsUsingBlock:^(id key, id value, BOOL*) {
- if ([value isKindOfClass:[NSString class]] || [value isKindOfClass:[NSURL class]])
+ if ([value isKindOfClass:[NSString class]] || [value isKindOfClass:[NSURL class]] || [value isKindOfClass:[NSNumber class]])
CFDictionarySetValue(filteredUserInfo.get(), key, value);
}];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
