Changeset 225666 in webkit

Timestamp:

Dec 7, 2017 7:00:42 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[WinCairo] Fix ResourceError handling in ArgumentCoder for wincairo webkit
​https://bugs.webkit.org/show_bug.cgi?id=180483

Patch by Yousuke Kimoto <​yousuke.kimoto@sony.com> on 2017-12-07
Reviewed by Alex Christensen.

• Shared/curl/WebCoreArgumentCodersCurl.cpp:

(IPC::ArgumentCoder<ResourceError>::encodePlatformData):
(IPC::ArgumentCoder<ResourceError>::decodePlatformData):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/curl/WebCoreArgumentCodersCurl.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-12-07  Yousuke Kimoto  <yousuke.kimoto@sony.com>
+
+        [WinCairo] Fix ResourceError handling in ArgumentCoder for wincairo webkit
+        https://bugs.webkit.org/show_bug.cgi?id=180483
+
+        Reviewed by Alex Christensen.
+
+        * Shared/curl/WebCoreArgumentCodersCurl.cpp:
+        (IPC::ArgumentCoder<ResourceError>::encodePlatformData):
+        (IPC::ArgumentCoder<ResourceError>::decodePlatformData):
+
 2017-12-07  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/Shared/curl/WebCoreArgumentCodersCurl.cpp

@@ -57 +57 @@
 }
 
-void ArgumentCoder<ResourceError>::encodePlatformData(Encoder&, const ResourceError&)
+void ArgumentCoder<ResourceError>::encodePlatformData(Encoder& encoder, const ResourceError& resourceError)
 {
+    encoder.encodeEnum(resourceError.type());
+    if (resourceError.isNull())
+        return;
+
+    encoder << resourceError.domain();
+    encoder << resourceError.errorCode();
+    encoder << resourceError.failingURL().string();
+    encoder << resourceError.localizedDescription();
+    encoder << resourceError.sslErrors();
 }
 
-bool ArgumentCoder<ResourceError>::decodePlatformData(Decoder&, ResourceError&)
+bool ArgumentCoder<ResourceError>::decodePlatformData(Decoder& decoder, ResourceError& resourceError)
 {
+    ResourceErrorBase::Type errorType;
+    if (!decoder.decodeEnum(errorType))
+        return false;
+    if (errorType == ResourceErrorBase::Type::Null) {
+        resourceError = { };
+        return true;
+    }
+
+    String domain;
+    if (!decoder.decode(domain))
+        return false;
+
+    int errorCode;
+    if (!decoder.decode(errorCode))
+        return false;
+
+    String failingURL;
+    if (!decoder.decode(failingURL))
+        return false;
+
+    String localizedDescription;
+    if (!decoder.decode(localizedDescription))
+        return false;
+
+    unsigned sslErrors;
+    if (!decoder.decode(sslErrors))
+        return false;
+
+    resourceError = ResourceError(domain, errorCode, URL(URL(), failingURL), localizedDescription, errorType);
+    resourceError.setSslErrors(sslErrors);
+
     return true;
 }