Title: [187312] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 187312
- Author
- [email protected]
- Date
- 2015-07-24 00:54:11 -0700 (Fri, 24 Jul 2015)
Log Message
Merge r187174. rdar://problem/21818117
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187311 => 187312)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 07:54:09 UTC (rev 187311)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 07:54:11 UTC (rev 187312)
@@ -1,5 +1,26 @@
2015-07-24 Matthew Hanson <[email protected]>
+ Merge r187174. rdar://problem/21818117
+
+ 2015-07-22 Sam Weinig <[email protected]>
+
+ 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.
+
+2015-07-24 Matthew Hanson <[email protected]>
+
Merge r187173. rdar://problem/21637698
2015-07-22 Beth Dakin <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (187311 => 187312)
--- branches/safari-601.1-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2015-07-24 07:54:09 UTC (rev 187311)
+++ branches/safari-601.1-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2015-07-24 07:54:11 UTC (rev 187312)
@@ -191,16 +191,8 @@
return true;
}
-void ArgumentCoder<ResourceError>::encodePlatformData(ArgumentEncoder& encoder, const ResourceError& resourceError)
+static void encodeNSError(ArgumentEncoder& encoder, NSError *nsError)
{
- bool errorIsNull = resourceError.isNull();
- encoder << errorIsNull;
-
- if (errorIsNull)
- return;
-
- NSError *nsError = resourceError.nsError();
-
String domain = [nsError domain];
encoder << domain;
@@ -242,19 +234,29 @@
}
ASSERT(!peerCertificateChain || [peerCertificateChain isKindOfClass:[NSArray class]]);
encoder << CertificateInfo((CFArrayRef)peerCertificateChain);
+
+ if (id underlyingError = [userInfo objectForKey:NSUnderlyingErrorKey]) {
+ ASSERT([underlyingError isKindOfClass:[NSError class]]);
+ encoder << true;
+ encodeNSError(encoder, underlyingError);
+ } else
+ encoder << false;
}
-bool ArgumentCoder<ResourceError>::decodePlatformData(ArgumentDecoder& decoder, ResourceError& resourceError)
+void ArgumentCoder<ResourceError>::encodePlatformData(ArgumentEncoder& encoder, const ResourceError& resourceError)
{
- bool errorIsNull;
- if (!decoder.decode(errorIsNull))
- return false;
-
- if (errorIsNull) {
- resourceError = ResourceError();
- return true;
- }
+ bool errorIsNull = resourceError.isNull();
+ encoder << errorIsNull;
+ if (errorIsNull)
+ return;
+
+ NSError *nsError = resourceError.nsError();
+ encodeNSError(encoder, nsError);
+}
+
+static bool decodeNSError(ArgumentDecoder& decoder, RetainPtr<NSError>& nsError)
+{
String domain;
if (!decoder.decode(domain))
return false;
@@ -276,8 +278,38 @@
CFDictionarySetValue((CFMutableDictionaryRef)userInfo.get(), CFSTR("NSErrorPeerCertificateChainKey"), (CFArrayRef)certificate.certificateChain());
}
- RetainPtr<NSError> nsError = adoptNS([[NSError alloc] initWithDomain:domain code:code userInfo:(NSDictionary *)userInfo.get()]);
+ bool hasUnderlyingError = false;
+ if (!decoder.decode(hasUnderlyingError))
+ return false;
+ 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;
+
resourceError = ResourceError(nsError.get());
return true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
