Title: [183546] trunk/Source/WebKit2
- Revision
- 183546
- Author
- carlo...@webkit.org
- Date
- 2015-04-29 08:47:25 -0700 (Wed, 29 Apr 2015)
Log Message
REGRESSION(r183467): [SOUP] isMainResource is no longer passed as resource load parameters to the network process
https://bugs.webkit.org/show_bug.cgi?id=144381
Reviewed by Darin Adler.
A requester enum value is passed now as part of the
ResourceRequest, but it's not encoded/decoded for soup.
* Shared/soup/WebCoreArgumentCodersSoup.cpp:
(IPC::ArgumentCoder<ResourceRequest>::encodePlatformData): Encode requester.
(IPC::ArgumentCoder<ResourceRequest>::decodePlatformData): Decode requester.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (183545 => 183546)
--- trunk/Source/WebKit2/ChangeLog 2015-04-29 14:34:53 UTC (rev 183545)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-29 15:47:25 UTC (rev 183546)
@@ -1,3 +1,17 @@
+2015-04-29 Carlos Garcia Campos <cgar...@igalia.com>
+
+ REGRESSION(r183467): [SOUP] isMainResource is no longer passed as resource load parameters to the network process
+ https://bugs.webkit.org/show_bug.cgi?id=144381
+
+ Reviewed by Darin Adler.
+
+ A requester enum value is passed now as part of the
+ ResourceRequest, but it's not encoded/decoded for soup.
+
+ * Shared/soup/WebCoreArgumentCodersSoup.cpp:
+ (IPC::ArgumentCoder<ResourceRequest>::encodePlatformData): Encode requester.
+ (IPC::ArgumentCoder<ResourceRequest>::decodePlatformData): Decode requester.
+
2015-04-28 Carlos Garcia Campos <cgar...@igalia.com>
[SOUP] Use xattrs to get/set the creation time of disk cache files
Modified: trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp (183545 => 183546)
--- trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp 2015-04-29 14:34:53 UTC (rev 183545)
+++ trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp 2015-04-29 15:47:25 UTC (rev 183546)
@@ -58,6 +58,7 @@
encoder << resourceRequest.allowCookies();
encoder.encodeEnum(resourceRequest.priority());
encoder.encodeEnum(resourceRequest.cachePolicy());
+ encoder.encodeEnum(resourceRequest.requester());
encoder << static_cast<uint32_t>(resourceRequest.soupMessageFlags());
encoder << resourceRequest.initiatingPageID();
@@ -115,6 +116,11 @@
return false;
resourceRequest.setCachePolicy(cachePolicy);
+ ResourceRequest::Requester requester;
+ if (!decoder.decodeEnum(requester))
+ return false;
+ resourceRequest.setRequester(requester);
+
uint32_t soupMessageFlags;
if (!decoder.decode(soupMessageFlags))
return false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
