<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[159887] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/159887">159887</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2013-11-30 10:49:53 -0800 (Sat, 30 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/15560240> ResourceError encoding drops NSURL-valued keys in the NSError’s userInfo, including NSErrorFailingURLKey
https://bugs.webkit.org/show_bug.cgi?id=125016
Reviewed by Anders “happy name day” Carlsson.
* Shared/mac/WebCoreArgumentCodersMac.mm:
(CoreIPC::::encodePlatformData): Encode all string- and URL-valued keys as a dictionary.
(CoreIPC::::decodePlatformData): Decode user info as a dictionary.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacWebCoreArgumentCodersMacmm">trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (159886 => 159887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2013-11-30 17:23:32 UTC (rev 159886)
+++ trunk/Source/WebKit2/ChangeLog        2013-11-30 18:49:53 UTC (rev 159887)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-11-30 Dan Bernstein <mitz@apple.com>
+
+ <rdar://problem/15560240> ResourceError encoding drops NSURL-valued keys in the NSError’s userInfo, including NSErrorFailingURLKey
+ https://bugs.webkit.org/show_bug.cgi?id=125016
+
+ Reviewed by Anders “happy name day” Carlsson.
+
+ * Shared/mac/WebCoreArgumentCodersMac.mm:
+ (CoreIPC::::encodePlatformData): Encode all string- and URL-valued keys as a dictionary.
+ (CoreIPC::::decodePlatformData): Decode user info as a dictionary.
+
</ins><span class="cx"> 2013-11-29 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix for EFL and GTK WK2 builds.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacWebCoreArgumentCodersMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (159886 => 159887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm        2013-11-30 17:23:32 UTC (rev 159886)
+++ trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm        2013-11-30 18:49:53 UTC (rev 159887)
</span><span class="lines">@@ -155,19 +155,17 @@
</span><span class="cx"> int64_t code = [nsError code];
</span><span class="cx"> encoder << code;
</span><span class="cx">
</span><del>- HashMap<String, String> stringUserInfoMap;
</del><ins>+ NSDictionary *userInfo = [nsError userInfo];
</ins><span class="cx">
</span><del>- NSDictionary* userInfo = [nsError userInfo];
- for (NSString *key in userInfo) {
- id value = [userInfo objectForKey:key];
- if (![value isKindOfClass:[NSString class]])
- continue;
</del><ins>+ RetainPtr<CFMutableDictionaryRef> filteredUserInfo = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, userInfo.count, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
</ins><span class="cx">
</span><del>- stringUserInfoMap.set(key, (NSString *)value);
- continue;
- }
- encoder << stringUserInfoMap;
</del><ins>+ [userInfo enumerateKeysAndObjectsUsingBlock:^(id key, id value, BOOL*) {
+ if ([value isKindOfClass:[NSString class]] || [value isKindOfClass:[NSURL class]])
+ CFDictionarySetValue(filteredUserInfo.get(), key, value);
+ }];
</ins><span class="cx">
</span><ins>+ CoreIPC::encode(encoder, filteredUserInfo.get());
+
</ins><span class="cx"> id peerCertificateChain = [userInfo objectForKey:@"NSErrorPeerCertificateChainKey"];
</span><span class="cx"> ASSERT(!peerCertificateChain || [peerCertificateChain isKindOfClass:[NSArray class]]);
</span><span class="cx"> encoder << CertificateInfo((CFArrayRef)peerCertificateChain);
</span><span class="lines">@@ -192,30 +190,21 @@
</span><span class="cx"> if (!decoder.decode(code))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- HashMap<String, String> stringUserInfoMap;
- if (!decoder.decode(stringUserInfoMap))
</del><ins>+ RetainPtr<CFDictionaryRef> userInfo;
+ if (!CoreIPC::decode(decoder, userInfo))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> CertificateInfo certificate;
</span><span class="cx"> if (!decoder.decode(certificate))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- NSUInteger userInfoSize = stringUserInfoMap.size();
- if (certificate.certificateChain())
- userInfoSize++;
</del><ins>+ if (certificate.certificateChain()) {
+ userInfo = adoptCF(CFDictionaryCreateMutableCopy(kCFAllocatorDefault, CFDictionaryGetCount(userInfo.get()) + 1, userInfo.get()));
+ CFDictionarySetValue((CFMutableDictionaryRef)userInfo.get(), CFSTR("NSErrorPeerCertificateChainKey"), (CFArrayRef)certificate.certificateChain());
+ }
</ins><span class="cx">
</span><del>- NSMutableDictionary* userInfo = [NSMutableDictionary dictionaryWithCapacity:userInfoSize];
-
- HashMap<String, String>::const_iterator it = stringUserInfoMap.begin();
- HashMap<String, String>::const_iterator end = stringUserInfoMap.end();
- for (; it != end; ++it)
- [userInfo setObject:nsString(it->value) forKey:nsString(it->key)];
</del><ins>+ RetainPtr<NSError> nsError = adoptNS([[NSError alloc] initWithDomain:nsString(domain) code:code userInfo:(NSDictionary *)userInfo.get()]);
</ins><span class="cx">
</span><del>- if (certificate.certificateChain())
- [userInfo setObject:(NSArray *)certificate.certificateChain() forKey:@"NSErrorPeerCertificateChainKey"];
-
- RetainPtr<NSError> nsError = adoptNS([[NSError alloc] initWithDomain:nsString(domain) code:code userInfo:userInfo]);
-
</del><span class="cx"> resourceError = ResourceError(nsError.get());
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>