From c39599569b89266ace9647142495552a45e65d0c Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <cgarcia@igalia.com>
Date: Mon, 17 Nov 2014 08:37:37 +0000
Subject: [PATCH] Merge r176119 - [SOUP] Encode/Decode allowCookies in
 ResourceRequest https://bugs.webkit.org/show_bug.cgi?id=138730

Reviewed by Sergio Villar Senin.

We are not sending this information to the network process, making
cookies always available. Fixes
http/tests/xmlhttprequest/cross-origin-no-authorization.html when
network process is enabled.

* Shared/soup/WebCoreArgumentCodersSoup.cpp:
(IPC::ArgumentCoder<ResourceRequest>::encodePlatformData):
(IPC::ArgumentCoder<ResourceRequest>::decodePlatformData):

Canonical link: https://commits.webkit.org/154760.209@webkitgtk/2.6
git-svn-id: https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.6@176189 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 Source/WebKit2/ChangeLog                         | 16 ++++++++++++++++
 .../Shared/soup/WebCoreArgumentCodersSoup.cpp    |  6 ++++++
 2 files changed, 22 insertions(+)

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index e441c7dec6b5..c51e3c0b01a0 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,19 @@
+2014-11-14  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] Encode/Decode allowCookies in ResourceRequest
+        https://bugs.webkit.org/show_bug.cgi?id=138730
+
+        Reviewed by Sergio Villar Senin.
+
+        We are not sending this information to the network process, making
+        cookies always available. Fixes
+        http/tests/xmlhttprequest/cross-origin-no-authorization.html when
+        network process is enabled.
+
+        * Shared/soup/WebCoreArgumentCodersSoup.cpp:
+        (IPC::ArgumentCoder<ResourceRequest>::encodePlatformData):
+        (IPC::ArgumentCoder<ResourceRequest>::decodePlatformData):
+
 2014-11-13  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [SOUP] Missing ResourceRequest members encoded/decoded
diff --git a/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp b/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp
index 5b2c696aa4dd..ec1fac470914 100644
--- a/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp
+++ b/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp
@@ -55,6 +55,7 @@ void ArgumentCoder<ResourceRequest>::encodePlatformData(ArgumentEncoder& encoder
         encoder << httpBody->flattenToString();
 
     encoder << resourceRequest.firstPartyForCookies().string();
+    encoder << resourceRequest.allowCookies();
     encoder.encodeEnum(resourceRequest.priority());
 
     encoder << static_cast<uint32_t>(resourceRequest.soupMessageFlags());
@@ -98,6 +99,11 @@ bool ArgumentCoder<ResourceRequest>::decodePlatformData(ArgumentDecoder& decoder
         return false;
     resourceRequest.setFirstPartyForCookies(URL(URL(), firstPartyForCookies));
 
+    bool allowCookies;
+    if (!decoder.decode(allowCookies))
+        return false;
+    resourceRequest.setAllowCookies(allowCookies);
+
     ResourceLoadPriority priority;
     if (!decoder.decodeEnum(priority))
         return false;