<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167121] releases/WebKitGTK/webkit-2.4</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167121">167121</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-11 03:39:13 -0700 (Fri, 11 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/166924">r166924</a> - [SOUP] Control cookie management according ResourceRequest.allowCookies()
https://bugs.webkit.org/show_bug.cgi?id=131026
Patch by Youenn Fablet <youenn.fablet@crf.canon.fr> on 2014-04-08
Reviewed by Sergio Villar Senin.
Source/WebCore:
Added per soup-message disabling of cookie jar manager when related ResourceRequest does not allow cookies (e.g. some cross-origin requests).
Patch is covered by unskipped test http/tests/xmlhttprequest/cross-origin-cookie-storage.html.
* platform/network/soup/ResourceRequestSoup.cpp:
(WebCore::ResourceRequest::updateSoupMessageMembers): Added disabling of cookie jar manager if cookies are not allowed.
Source/WebKit2:
Added setting of accept cookies policy for the current soup network session cookie jar and all tracked sessions.
Moved the implementation of cookie policy setting from WebCookieManager to WebFrameNetworkingContext.
* WebProcess/Cookies/soup/WebCookieManagerSoup.cpp:
(WebKit::WebCookieManager::platformSetHTTPCookieAcceptPolicy): Moved implementation to WebCookieManager::platformSetHTTPCookieAcceptPolicy.
* WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp:
(WebKit::WebFrameNetworkingContext::setCookieAcceptPolicyForAllContexts): Moved implementation from WebCookieManager::platformSetHTTPCookieAcceptPolicy and set the cookie jar accept policy to the cookie jars of all sessions in addition to the default cookie jar.
* WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h: Added method prototype.
LayoutTests:
* platform/efl/TestExpectations: Unskipped test http/tests/xmlhttprequest/cross-origin-cookie-storage.html.
* platform/gtk/TestExpectations: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsplatformeflTestExpectations">releases/WebKitGTK/webkit-2.4/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsplatformgtkTestExpectations">releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformnetworksoupResourceRequestSoupcpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2WebProcessCookiessoupWebCookieManagerSoupcpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/Cookies/soup/WebCookieManagerSoup.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2WebProcessWebCoreSupportsoupWebFrameNetworkingContextcpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2WebProcessWebCoreSupportsoupWebFrameNetworkingContexth">releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog (167120 => 167121)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2014-04-11 10:22:25 UTC (rev 167120)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2014-04-11 10:39:13 UTC (rev 167121)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-04-08 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [SOUP] Control cookie management according ResourceRequest.allowCookies()
+ https://bugs.webkit.org/show_bug.cgi?id=131026
+
+ Reviewed by Sergio Villar Senin.
+
+ * platform/efl/TestExpectations: Unskipped test http/tests/xmlhttprequest/cross-origin-cookie-storage.html.
+ * platform/gtk/TestExpectations: Ditto.
+
</ins><span class="cx"> 2014-02-11 Piotr Grad <p.grad@samsung.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] High playback rate causes crash
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/LayoutTests/platform/efl/TestExpectations (167120 => 167121)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/platform/efl/TestExpectations 2014-04-11 10:22:25 UTC (rev 167120)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/platform/efl/TestExpectations 2014-04-11 10:39:13 UTC (rev 167121)
</span><span class="lines">@@ -234,7 +234,6 @@
</span><span class="cx"> http/tests/security/xss-DENIED-xsl-document-redirect.xml
</span><span class="cx"> http/tests/security/xss-DENIED-xsl-external-entity-redirect.xml
</span><span class="cx"> http/tests/xmlhttprequest/access-control-basic-whitelist-request-headers.html
</span><del>-http/tests/xmlhttprequest/cross-origin-cookie-storage.html
</del><span class="cx"> http/tests/xmlhttprequest/cross-origin-no-authorization.html
</span><span class="cx"> http/tests/xmlhttprequest/logout.html
</span><span class="cx"> http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/TestExpectations (167120 => 167121)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/TestExpectations 2014-04-11 10:22:25 UTC (rev 167120)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/TestExpectations 2014-04-11 10:39:13 UTC (rev 167121)
</span><span class="lines">@@ -1006,8 +1006,6 @@
</span><span class="cx">
</span><span class="cx"> Bug(GTK) http/tests/xmlhttprequest/logout.html [ Failure ]
</span><span class="cx">
</span><del>-# We don't seem to support neither of these for now
-Bug(GTK) http/tests/xmlhttprequest/cross-origin-cookie-storage.html [ Failure ]
</del><span class="cx"> Bug(GTK) http/tests/xmlhttprequest/cross-origin-no-authorization.html [ Failure ]
</span><span class="cx">
</span><span class="cx"> Bug(GTK) media/video-size-intrinsic-scale.html [ Failure ]
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (167120 => 167121)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-04-11 10:22:25 UTC (rev 167120)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-04-11 10:39:13 UTC (rev 167121)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-04-08 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [SOUP] Control cookie management according ResourceRequest.allowCookies()
+ https://bugs.webkit.org/show_bug.cgi?id=131026
+
+ Reviewed by Sergio Villar Senin.
+
+ Added per soup-message disabling of cookie jar manager when related ResourceRequest does not allow cookies (e.g. some cross-origin requests).
+
+ Patch is covered by unskipped test http/tests/xmlhttprequest/cross-origin-cookie-storage.html.
+
+ * platform/network/soup/ResourceRequestSoup.cpp:
+ (WebCore::ResourceRequest::updateSoupMessageMembers): Added disabling of cookie jar manager if cookies are not allowed.
+
</ins><span class="cx"> 2014-04-11 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. [GTK] Plugin process crashes when loading totem plugin
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformnetworksoupResourceRequestSoupcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp (167120 => 167121)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2014-04-11 10:22:25 UTC (rev 167120)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2014-04-11 10:39:13 UTC (rev 167121)
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx">
</span><span class="cx"> if (!acceptEncoding())
</span><span class="cx"> soup_message_disable_feature(soupMessage, SOUP_TYPE_CONTENT_DECODER);
</span><ins>+ if (!allowCookies())
+ soup_message_disable_feature(soupMessage, SOUP_TYPE_COOKIE_JAR);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequest::updateSoupMessageHeaders(SoupMessageHeaders* soupHeaders) const
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (167120 => 167121)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-04-11 10:22:25 UTC (rev 167120)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-04-11 10:39:13 UTC (rev 167121)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-04-08 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [SOUP] Control cookie management according ResourceRequest.allowCookies()
+ https://bugs.webkit.org/show_bug.cgi?id=131026
+
+ Reviewed by Sergio Villar Senin.
+
+ Added setting of accept cookies policy for the current soup network session cookie jar and all tracked sessions.
+ Moved the implementation of cookie policy setting from WebCookieManager to WebFrameNetworkingContext.
+
+ * WebProcess/Cookies/soup/WebCookieManagerSoup.cpp:
+ (WebKit::WebCookieManager::platformSetHTTPCookieAcceptPolicy): Moved implementation to WebCookieManager::platformSetHTTPCookieAcceptPolicy.
+ * WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp:
+ (WebKit::WebFrameNetworkingContext::setCookieAcceptPolicyForAllContexts): Moved implementation from WebCookieManager::platformSetHTTPCookieAcceptPolicy and set the cookie jar accept policy to the cookie jars of all sessions in addition to the default cookie jar.
+ * WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h: Added method prototype.
+
</ins><span class="cx"> 2014-04-01 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Don't copy the children map in webkitWebViewBaseContainerForall
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2WebProcessCookiessoupWebCookieManagerSoupcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/Cookies/soup/WebCookieManagerSoup.cpp (167120 => 167121)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/Cookies/soup/WebCookieManagerSoup.cpp 2014-04-11 10:22:25 UTC (rev 167120)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/Cookies/soup/WebCookieManagerSoup.cpp 2014-04-11 10:39:13 UTC (rev 167121)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "WebCookieManager.h"
</span><span class="cx">
</span><span class="cx"> #include "ChildProcess.h"
</span><ins>+#include "WebFrameNetworkingContext.h"
</ins><span class="cx"> #include "WebKitSoupCookieJarSqlite.h"
</span><span class="cx"> #include <WebCore/CookieJarSoup.h>
</span><span class="cx"> #include <WebCore/SoupNetworkSession.h>
</span><span class="lines">@@ -40,22 +41,7 @@
</span><span class="cx">
</span><span class="cx"> void WebCookieManager::platformSetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy)
</span><span class="cx"> {
</span><del>- SoupCookieJar* cookieJar = WebCore::soupCookieJar();
- SoupCookieJarAcceptPolicy soupPolicy;
-
- soupPolicy = SOUP_COOKIE_JAR_ACCEPT_ALWAYS;
- switch (policy) {
- case HTTPCookieAcceptPolicyAlways:
- soupPolicy = SOUP_COOKIE_JAR_ACCEPT_ALWAYS;
- break;
- case HTTPCookieAcceptPolicyNever:
- soupPolicy = SOUP_COOKIE_JAR_ACCEPT_NEVER;
- break;
- case HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
- soupPolicy = SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY;
- break;
- }
- soup_cookie_jar_set_accept_policy(cookieJar, soupPolicy);
</del><ins>+ WebFrameNetworkingContext::setCookieAcceptPolicyForAllContexts(policy);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HTTPCookieAcceptPolicy WebCookieManager::platformGetHTTPCookieAcceptPolicy()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2WebProcessWebCoreSupportsoupWebFrameNetworkingContextcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp (167120 => 167121)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp 2014-04-11 10:22:25 UTC (rev 167120)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp 2014-04-11 10:39:13 UTC (rev 167121)
</span><span class="lines">@@ -30,7 +30,10 @@
</span><span class="cx"> #include "SessionTracker.h"
</span><span class="cx"> #include "WebFrame.h"
</span><span class="cx"> #include "WebPage.h"
</span><ins>+#include <WebCore/CookieJarSoup.h>
+#include <WebCore/NetworkStorageSession.h>
</ins><span class="cx"> #include <WebCore/Settings.h>
</span><ins>+#include <WebCore/SoupNetworkSession.h>
</ins><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -47,6 +50,33 @@
</span><span class="cx"> SessionTracker::setSession(sessionID, NetworkStorageSession::createPrivateBrowsingSession(String::number(sessionID)));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebFrameNetworkingContext::setCookieAcceptPolicyForAllContexts(HTTPCookieAcceptPolicy policy)
+{
+ SoupCookieJarAcceptPolicy soupPolicy = SOUP_COOKIE_JAR_ACCEPT_ALWAYS;
+ switch (policy) {
+ case HTTPCookieAcceptPolicyAlways:
+ soupPolicy = SOUP_COOKIE_JAR_ACCEPT_ALWAYS;
+ break;
+ case HTTPCookieAcceptPolicyNever:
+ soupPolicy = SOUP_COOKIE_JAR_ACCEPT_NEVER;
+ break;
+ case HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
+ soupPolicy = SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY;
+ break;
+ }
+
+ SoupCookieJar* cookieJar = WebCore::soupCookieJar();
+ soup_cookie_jar_set_accept_policy(cookieJar, soupPolicy);
+
+ SoupNetworkSession& soupSession = NetworkStorageSession::defaultStorageSession().soupNetworkSession();
+ soup_cookie_jar_set_accept_policy(soupSession.cookieJar(), soupPolicy);
+
+ for (const auto& session : SessionTracker::sessionMap().values()) {
+ if (session)
+ soup_cookie_jar_set_accept_policy(session->soupNetworkSession().cookieJar(), soupPolicy);
+ }
+}
+
</ins><span class="cx"> WebFrameNetworkingContext::WebFrameNetworkingContext(WebFrame* frame)
</span><span class="cx"> : FrameNetworkingContext(frame->coreFrame())
</span><span class="cx"> {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2WebProcessWebCoreSupportsoupWebFrameNetworkingContexth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h (167120 => 167121)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h 2014-04-11 10:22:25 UTC (rev 167120)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h 2014-04-11 10:39:13 UTC (rev 167121)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #ifndef WebFrameNetworkingContext_h
</span><span class="cx"> #define WebFrameNetworkingContext_h
</span><span class="cx">
</span><ins>+#include "HTTPCookieAcceptPolicy.h"
</ins><span class="cx"> #include <WebCore/FrameNetworkingContext.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -43,6 +44,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void ensurePrivateBrowsingSession(uint64_t sessionID);
</span><ins>+ static void setCookieAcceptPolicyForAllContexts(HTTPCookieAcceptPolicy);
</ins><span class="cx">
</span><span class="cx"> WebFrameLoaderClient* webFrameLoaderClient() const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>