REGRESSION(r183467): [SOUP] isMainResource is no longer passed as resource load param...
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 29 Apr 2015 15:47:25 +0000 (15:47 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 29 Apr 2015 15:47:25 +0000 (15:47 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@183546 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp

index 2843f50..5023752 100644 (file)
@@ -1,3 +1,17 @@
+2015-04-29  Carlos Garcia Campos  <cgarcia@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  <cgarcia@igalia.com>
 
         [SOUP] Use xattrs to get/set the creation time of disk cache files
index fa827b6..670164f 100644 (file)
@@ -58,6 +58,7 @@ void ArgumentCoder<ResourceRequest>::encodePlatformData(ArgumentEncoder& encoder
     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 @@ bool ArgumentCoder<ResourceRequest>::decodePlatformData(ArgumentDecoder& decoder
         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;