Title: [187127] branches/safari-600.8-branch/Source/WebKit2
Revision
187127
Author
lforsch...@apple.com
Date
2015-07-21 15:00:44 -0700 (Tue, 21 Jul 2015)

Log Message

Merged r186812.  rdar://problem/21877954

Modified Paths

Diff

Modified: branches/safari-600.8-branch/Source/WebKit2/ChangeLog (187126 => 187127)


--- branches/safari-600.8-branch/Source/WebKit2/ChangeLog	2015-07-21 21:43:04 UTC (rev 187126)
+++ branches/safari-600.8-branch/Source/WebKit2/ChangeLog	2015-07-21 22:00:44 UTC (rev 187127)
@@ -1,3 +1,20 @@
+2015-07-21  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-15  Matthew Hanson  <matthew_han...@apple.com>
 
         Merge r186838. rdar://problem/21716363

Modified: branches/safari-600.8-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (187126 => 187127)


--- branches/safari-600.8-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm	2015-07-21 21:43:04 UTC (rev 187126)
+++ branches/safari-600.8-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm	2015-07-21 22:00:44 UTC (rev 187127)
@@ -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

Reply via email to