Title: [187174] trunk/Source/WebKit2
- Revision
- 187174
- Author
- wei...@apple.com
- Date
- 2015-07-22 12:56:16 -0700 (Wed, 22 Jul 2015)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (187173 => 187174)
--- 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)
@@ -1,3 +1,20 @@
+2015-07-22 Sam Weinig <s...@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.
+
2015-07-22 Beth Dakin <bda...@apple.com>
Animated images should animate in previews
Modified: trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (187173 => 187174)
--- 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)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
