Changeset 227095 in webkit

Timestamp:

Jan 17, 2018 4:26:31 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[Curl] Use ResourceRequest::encodeWithPlatformData()
​https://bugs.webkit.org/show_bug.cgi?id=181768

Patch by Stephan Szabo <​stephan.szabo@sony.com> on 2018-01-17
Reviewed by Alex Christensen.

Source/WebCore:

No new tests, assertion hit in downstream port, should be covered by
existing tests.

• platform/network/curl/ResourceRequest.h:

(WebCore::ResourceRequest::encodeWithPlatformData const):
(WebCore::ResourceRequest::decodeWithPlatformData):

Source/WebKit:

• Shared/curl/WebCoreArgumentCodersCurl.cpp:

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

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/curl/ResourceRequest.h (modified) (3 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/curl/WebCoreArgumentCodersCurl.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-01-17  Stephan Szabo  <stephan.szabo@sony.com>
+
+        [Curl] Use ResourceRequest::encodeWithPlatformData()
+        https://bugs.webkit.org/show_bug.cgi?id=181768
+
+        Reviewed by Alex Christensen.
+
+        No new tests, assertion hit in downstream port, should be covered by
+        existing tests.
+
+        * platform/network/curl/ResourceRequest.h:
+        (WebCore::ResourceRequest::encodeWithPlatformData const):
+        (WebCore::ResourceRequest::decodeWithPlatformData):
+
 2018-01-17  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/platform/network/curl/ResourceRequest.h

@@ -2 +2 @@
  * Copyright (C) 2003, 2006 Apple Inc.  All rights reserved.
  * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
+ * Copyright (C) 2018 Sony Interactive Entertainment Inc.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -70 +71 @@
     static void setHTTPPipeliningEnabled(bool) { }
 
+    template<class Encoder> void encodeWithPlatformData(Encoder&) const;
+    template<class Decoder> bool decodeWithPlatformData(Decoder&);
+
 private:
     friend class ResourceRequestBase;
@@ -83 +87 @@
 };
 
+template<class Encoder>
+void ResourceRequest::encodeWithPlatformData(Encoder& encoder) const
+{
+    encodeBase(encoder);
+}
+
+template<class Decoder>
+bool ResourceRequest::decodeWithPlatformData(Decoder& decoder)
+{
+    if (!decodeBase(decoder))
+        return false;
+
+    return true;
+}
+
 } // namespace WebCore

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-01-17  Stephan Szabo  <stephan.szabo@sony.com>
+
+        [Curl] Use ResourceRequest::encodeWithPlatformData()
+        https://bugs.webkit.org/show_bug.cgi?id=181768
+
+        Reviewed by Alex Christensen.
+
+        * Shared/curl/WebCoreArgumentCodersCurl.cpp:
+        (IPC::ArgumentCoder<ResourceRequest>::encodePlatformData):
+        (IPC::ArgumentCoder<ResourceRequest>::decodePlatformData):
+
 2018-01-17  Matt Lewis  <jlewis3@apple.com>
 

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2017 Sony Interactive Entertainment Inc.
+ * Copyright (C) 2018 Sony Interactive Entertainment Inc.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40 +40 @@
 void ArgumentCoder<ResourceRequest>::encodePlatformData(Encoder& encoder, const ResourceRequest& resourceRequest)
 {
-    resourceRequest.encodeWithoutPlatformData(encoder);
+    resourceRequest.encodeWithPlatformData(encoder);
 }
 
 bool ArgumentCoder<ResourceRequest>::decodePlatformData(Decoder& decoder, ResourceRequest& resourceRequest)
 {
-    return resourceRequest.decodeWithoutPlatformData(decoder);
+    return resourceRequest.decodeWithPlatformData(decoder);
 }