Title: [227095] trunk/Source
- Revision
- 227095
- Author
- [email protected]
- Date
- 2018-01-17 16:26:31 -0800 (Wed, 17 Jan 2018)
Log Message
[Curl] Use ResourceRequest::encodeWithPlatformData()
https://bugs.webkit.org/show_bug.cgi?id=181768
Patch by Stephan Szabo <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (227094 => 227095)
--- trunk/Source/WebCore/ChangeLog 2018-01-18 00:04:49 UTC (rev 227094)
+++ trunk/Source/WebCore/ChangeLog 2018-01-18 00:26:31 UTC (rev 227095)
@@ -1,3 +1,17 @@
+2018-01-17 Stephan Szabo <[email protected]>
+
+ [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 <[email protected]>
Use existing RGB colorspace instead of creating a new one
Modified: trunk/Source/WebCore/platform/network/curl/ResourceRequest.h (227094 => 227095)
--- trunk/Source/WebCore/platform/network/curl/ResourceRequest.h 2018-01-18 00:04:49 UTC (rev 227094)
+++ trunk/Source/WebCore/platform/network/curl/ResourceRequest.h 2018-01-18 00:26:31 UTC (rev 227095)
@@ -1,6 +1,7 @@
/*
* Copyright (C) 2003, 2006 Apple Inc. All rights reserved.
* Copyright (C) 2006 Samuel Weinig <[email protected]>
+ * Copyright (C) 2018 Sony Interactive Entertainment Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -69,6 +70,9 @@
static bool httpPipeliningEnabled() { return false; }
static void setHTTPPipeliningEnabled(bool) { }
+ template<class Encoder> void encodeWithPlatformData(Encoder&) const;
+ template<class Decoder> bool decodeWithPlatformData(Decoder&);
+
private:
friend class ResourceRequestBase;
@@ -82,4 +86,19 @@
static bool s_httpPipeliningEnabled;
};
+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
Modified: trunk/Source/WebKit/ChangeLog (227094 => 227095)
--- trunk/Source/WebKit/ChangeLog 2018-01-18 00:04:49 UTC (rev 227094)
+++ trunk/Source/WebKit/ChangeLog 2018-01-18 00:26:31 UTC (rev 227095)
@@ -1,3 +1,14 @@
+2018-01-17 Stephan Szabo <[email protected]>
+
+ [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 <[email protected]>
Unreviewed, rolling out r227076.
Modified: trunk/Source/WebKit/Shared/curl/WebCoreArgumentCodersCurl.cpp (227094 => 227095)
--- trunk/Source/WebKit/Shared/curl/WebCoreArgumentCodersCurl.cpp 2018-01-18 00:04:49 UTC (rev 227094)
+++ trunk/Source/WebKit/Shared/curl/WebCoreArgumentCodersCurl.cpp 2018-01-18 00:26:31 UTC (rev 227095)
@@ -1,5 +1,5 @@
/*
- * 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
* modification, are permitted provided that the following conditions
@@ -39,12 +39,12 @@
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);
}
void ArgumentCoder<CertificateInfo>::encode(Encoder&, const CertificateInfo&)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
