<!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>[187174] 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/187174">187174</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2015-07-22 12:56:16 -0700 (Wed, 22 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Encode/Decode underlying errors when serializing NSErrors
<rdar://problem/21818117>
https://bugs.webkit.org/show_bug.cgi?id=147199
Reviewed by Anders Carlsson.
* Shared/mac/WebCoreArgumentCodersMac.mm:
(IPC::ArgumentCoder<CertificateInfo>::decode):
(IPC::encodeNSError):
(IPC::ArgumentCoder<ResourceError>::encodePlatformData):
(IPC::decodeNSError):
(IPC::ArgumentCoder<ResourceError>::decodePlatformData):
Break out encoding/decoding of the NSErrors into a helpers so they can be called
for the underlying error.</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 (187173 => 187174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-22 19:15:06 UTC (rev 187173)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-22 19:56:16 UTC (rev 187174)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-07-22 Sam Weinig <sam@webkit.org>
+
+ Encode/Decode underlying errors when serializing NSErrors
+ <rdar://problem/21818117>
+ https://bugs.webkit.org/show_bug.cgi?id=147199
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/mac/WebCoreArgumentCodersMac.mm:
+ (IPC::ArgumentCoder<CertificateInfo>::decode):
+ (IPC::encodeNSError):
+ (IPC::ArgumentCoder<ResourceError>::encodePlatformData):
+ (IPC::decodeNSError):
+ (IPC::ArgumentCoder<ResourceError>::decodePlatformData):
+ Break out encoding/decoding of the NSErrors into a helpers so they can be called
+ for the underlying error.
+
</ins><span class="cx"> 2015-07-22 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Animated images should animate in previews
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacWebCoreArgumentCodersMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (187173 => 187174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2015-07-22 19:15:06 UTC (rev 187173)
+++ trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2015-07-22 19:56:16 UTC (rev 187174)
</span><span class="lines">@@ -191,16 +191,8 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentCoder<ResourceError>::encodePlatformData(ArgumentEncoder& encoder, const ResourceError& resourceError)
</del><ins>+static void encodeNSError(ArgumentEncoder& encoder, NSError *nsError)
</ins><span class="cx"> {
</span><del>- bool errorIsNull = resourceError.isNull();
- encoder << errorIsNull;
-
- if (errorIsNull)
- return;
-
- NSError *nsError = resourceError.nsError();
-
</del><span class="cx"> String domain = [nsError domain];
</span><span class="cx"> encoder << domain;
</span><span class="cx">
</span><span class="lines">@@ -242,19 +234,29 @@
</span><span class="cx"> }
</span><span class="cx"> ASSERT(!peerCertificateChain || [peerCertificateChain isKindOfClass:[NSArray class]]);
</span><span class="cx"> encoder << CertificateInfo((CFArrayRef)peerCertificateChain);
</span><ins>+
+ if (id underlyingError = [userInfo objectForKey:NSUnderlyingErrorKey]) {
+ ASSERT([underlyingError isKindOfClass:[NSError class]]);
+ encoder << true;
+ encodeNSError(encoder, underlyingError);
+ } else
+ encoder << false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<ResourceError>::decodePlatformData(ArgumentDecoder& decoder, ResourceError& resourceError)
</del><ins>+void ArgumentCoder<ResourceError>::encodePlatformData(ArgumentEncoder& encoder, const ResourceError& resourceError)
</ins><span class="cx"> {
</span><del>- bool errorIsNull;
- if (!decoder.decode(errorIsNull))
- return false;
-
- if (errorIsNull) {
- resourceError = ResourceError();
- return true;
- }
</del><ins>+ bool errorIsNull = resourceError.isNull();
+ encoder << errorIsNull;
</ins><span class="cx">
</span><ins>+ if (errorIsNull)
+ return;
+
+ NSError *nsError = resourceError.nsError();
+ encodeNSError(encoder, nsError);
+}
+
+static bool decodeNSError(ArgumentDecoder& decoder, RetainPtr<NSError>& nsError)
+{
</ins><span class="cx"> String domain;
</span><span class="cx"> if (!decoder.decode(domain))
</span><span class="cx"> return false;
</span><span class="lines">@@ -276,8 +278,38 @@
</span><span class="cx"> CFDictionarySetValue((CFMutableDictionaryRef)userInfo.get(), CFSTR("NSErrorPeerCertificateChainKey"), (CFArrayRef)certificate.certificateChain());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RetainPtr<NSError> nsError = adoptNS([[NSError alloc] initWithDomain:domain code:code userInfo:(NSDictionary *)userInfo.get()]);
</del><ins>+ bool hasUnderlyingError = false;
+ if (!decoder.decode(hasUnderlyingError))
+ return false;
</ins><span class="cx">
</span><ins>+ if (hasUnderlyingError) {
+ RetainPtr<NSError> underlyingNSError;
+ if (!decodeNSError(decoder, underlyingNSError))
+ return false;
+
+ userInfo = adoptCF(CFDictionaryCreateMutableCopy(kCFAllocatorDefault, CFDictionaryGetCount(userInfo.get()) + 1, userInfo.get()));
+ CFDictionarySetValue((CFMutableDictionaryRef)userInfo.get(), NSUnderlyingErrorKey, underlyingNSError.get());
+ }
+
+ nsError = adoptNS([[NSError alloc] initWithDomain:domain code:code userInfo:(NSDictionary *)userInfo.get()]);
+ return true;
+}
+
+bool ArgumentCoder<ResourceError>::decodePlatformData(ArgumentDecoder& decoder, ResourceError& resourceError)
+{
+ bool errorIsNull;
+ if (!decoder.decode(errorIsNull))
+ return false;
+
+ if (errorIsNull) {
+ resourceError = ResourceError();
+ return true;
+ }
+
+ RetainPtr<NSError> nsError;
+ if (!decodeNSError(decoder, nsError))
+ return false;
+
</ins><span class="cx"> resourceError = ResourceError(nsError.get());
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>