summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/in_process_webkit/browser_webkitclient_impl.cc10
-rw-r--r--chrome/browser/in_process_webkit/browser_webkitclient_impl.h7
-rw-r--r--chrome/plugin/webplugin_proxy.cc10
-rw-r--r--chrome/plugin/webplugin_proxy.h4
-rw-r--r--chrome/worker/worker_webkitclient_impl.cc4
-rw-r--r--chrome/worker/worker_webkitclient_impl.h7
-rw-r--r--webkit/glue/plugins/plugin_host.cc3
-rw-r--r--webkit/glue/unittest_test_server.h2
-rw-r--r--webkit/glue/webkitclient_impl.cc2
-rw-r--r--webkit/glue/webkitclient_impl.h2
-rw-r--r--webkit/glue/webplugin.h4
-rw-r--r--webkit/glue/webplugin_impl.cc10
-rw-r--r--webkit/glue/webplugin_impl.h4
13 files changed, 39 insertions, 30 deletions
diff --git a/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc b/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc
index a6d772a..4daf282 100644
--- a/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc
+++ b/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc
@@ -47,14 +47,16 @@ BrowserWebKitClientImpl::createMessagePortChannel() {
return NULL;
}
-void BrowserWebKitClientImpl::setCookies(const WebKit::WebURL& url,
- const WebKit::WebURL& policy_url,
- const WebKit::WebString& value) {
+void BrowserWebKitClientImpl::setCookies(
+ const WebKit::WebURL& url,
+ const WebKit::WebURL& first_party_for_cookies,
+ const WebKit::WebString& value) {
NOTREACHED();
}
WebKit::WebString BrowserWebKitClientImpl::cookies(
- const WebKit::WebURL& url, const WebKit::WebURL& policy_url) {
+ const WebKit::WebURL& url,
+ const WebKit::WebURL& first_party_for_cookies) {
NOTREACHED();
return WebKit::WebString();
}
diff --git a/chrome/browser/in_process_webkit/browser_webkitclient_impl.h b/chrome/browser/in_process_webkit/browser_webkitclient_impl.h
index dd4b401..0879cc8 100644
--- a/chrome/browser/in_process_webkit/browser_webkitclient_impl.h
+++ b/chrome/browser/in_process_webkit/browser_webkitclient_impl.h
@@ -19,10 +19,11 @@ class BrowserWebKitClientImpl : public webkit_glue::WebKitClientImpl {
virtual bool isLinkVisited(unsigned long long linkHash);
virtual WebKit::WebMessagePortChannel* createMessagePortChannel();
virtual void setCookies(const WebKit::WebURL& url,
- const WebKit::WebURL& policy_url,
+ const WebKit::WebURL& first_party_for_cookies,
const WebKit::WebString& value);
- virtual WebKit::WebString cookies(const WebKit::WebURL& url,
- const WebKit::WebURL& policy_url);
+ virtual WebKit::WebString cookies(
+ const WebKit::WebURL& url,
+ const WebKit::WebURL& first_party_for_cookies);
virtual void prefetchHostName(const WebKit::WebString&);
virtual WebKit::WebString defaultLocale();
virtual WebKit::WebThemeEngine* themeEngine();
diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc
index 5033d8e..b6a6973 100644
--- a/chrome/plugin/webplugin_proxy.cc
+++ b/chrome/plugin/webplugin_proxy.cc
@@ -182,15 +182,17 @@ NPObject* WebPluginProxy::GetPluginElement() {
}
void WebPluginProxy::SetCookie(const GURL& url,
- const GURL& policy_url,
+ const GURL& first_party_for_cookies,
const std::string& cookie) {
- Send(new PluginHostMsg_SetCookie(route_id_, url, policy_url, cookie));
+ Send(new PluginHostMsg_SetCookie(route_id_, url,
+ first_party_for_cookies, cookie));
}
std::string WebPluginProxy::GetCookies(const GURL& url,
- const GURL& policy_url) {
+ const GURL& first_party_for_cookies) {
std::string cookies;
- Send(new PluginHostMsg_GetCookies(route_id_, url, policy_url, &cookies));
+ Send(new PluginHostMsg_GetCookies(route_id_, url,
+ first_party_for_cookies, &cookies));
return cookies;
}
diff --git a/chrome/plugin/webplugin_proxy.h b/chrome/plugin/webplugin_proxy.h
index fbf88f6..7b283f6 100644
--- a/chrome/plugin/webplugin_proxy.h
+++ b/chrome/plugin/webplugin_proxy.h
@@ -53,9 +53,9 @@ class WebPluginProxy : public webkit_glue::WebPlugin {
NPObject* GetWindowScriptNPObject();
NPObject* GetPluginElement();
void SetCookie(const GURL& url,
- const GURL& policy_url,
+ const GURL& first_party_for_cookies,
const std::string& cookie);
- std::string GetCookies(const GURL& url, const GURL& policy_url);
+ std::string GetCookies(const GURL& url, const GURL& first_party_for_cookies);
void ShowModalHTMLDialog(const GURL& url, int width, int height,
const std::string& json_arguments,
diff --git a/chrome/worker/worker_webkitclient_impl.cc b/chrome/worker/worker_webkitclient_impl.cc
index 12ed15a..bb8bb04 100644
--- a/chrome/worker/worker_webkitclient_impl.cc
+++ b/chrome/worker/worker_webkitclient_impl.cc
@@ -57,13 +57,13 @@ WorkerWebKitClientImpl::createMessagePortChannel() {
}
void WorkerWebKitClientImpl::setCookies(const WebURL& url,
- const WebURL& policy_url,
+ const WebURL& first_party_for_cookies,
const WebString& value) {
NOTREACHED();
}
WebString WorkerWebKitClientImpl::cookies(
- const WebURL& url, const WebURL& policy_url) {
+ const WebURL& url, const WebURL& first_party_for_cookies) {
NOTREACHED();
return WebString();
}
diff --git a/chrome/worker/worker_webkitclient_impl.h b/chrome/worker/worker_webkitclient_impl.h
index 23b75d8..32ab01d 100644
--- a/chrome/worker/worker_webkitclient_impl.h
+++ b/chrome/worker/worker_webkitclient_impl.h
@@ -21,10 +21,11 @@ class WorkerWebKitClientImpl : public webkit_glue::WebKitClientImpl,
virtual bool isLinkVisited(unsigned long long linkHash);
virtual WebKit::WebMessagePortChannel* createMessagePortChannel();
virtual void setCookies(const WebKit::WebURL& url,
- const WebKit::WebURL& policy_url,
+ const WebKit::WebURL& first_party_for_cookies,
const WebKit::WebString& value);
- virtual WebKit::WebString cookies(const WebKit::WebURL& url,
- const WebKit::WebURL& policy_url);
+ virtual WebKit::WebString cookies(
+ const WebKit::WebURL& url,
+ const WebKit::WebURL& first_party_for_cookies);
virtual void prefetchHostName(const WebKit::WebString&);
virtual bool getFileSize(const WebKit::WebString& path, long long& result);
virtual WebKit::WebString defaultLocale();
diff --git a/webkit/glue/plugins/plugin_host.cc b/webkit/glue/plugins/plugin_host.cc
index 256716f..7abe811 100644
--- a/webkit/glue/plugins/plugin_host.cc
+++ b/webkit/glue/plugins/plugin_host.cc
@@ -1040,7 +1040,8 @@ NPError NPN_GetValueForURL(NPP id,
if (!webplugin)
return NPERR_GENERIC_ERROR;
- // Bypass third-party cookie blocking by using the url as the policy_url.
+ // Bypass third-party cookie blocking by using the url as the
+ // first_party_for_cookies.
GURL cookies_url((std::string(url)));
result = webplugin->GetCookies(cookies_url, cookies_url);
break;
diff --git a/webkit/glue/unittest_test_server.h b/webkit/glue/unittest_test_server.h
index 139909e..44caa29 100644
--- a/webkit/glue/unittest_test_server.h
+++ b/webkit/glue/unittest_test_server.h
@@ -38,7 +38,7 @@ class UnittestTestServer : public HTTPTestServer {
scoped_ptr<ResourceLoaderBridge> loader(
ResourceLoaderBridge::Create("GET",
url,
- url, // policy_url
+ url, // first_party_for_cookies
GURL(), // no referrer
std::string(), // no extra headers
"null", // frame_origin
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index 6d29eb1..a77e8d1 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -118,7 +118,7 @@ WebThemeEngine* WebKitClientImpl::themeEngine() {
}
bool WebKitClientImpl::rawCookies(const WebURL& url,
- const WebURL& policy_url,
+ const WebURL& first_party_for_cookies,
WebVector<WebCookie>* raw_cookies) {
NOTREACHED();
return false;
diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h
index 4791d64..16b4c67 100644
--- a/webkit/glue/webkitclient_impl.h
+++ b/webkit/glue/webkitclient_impl.h
@@ -51,7 +51,7 @@ class WebKitClientImpl : public WebKit::WebKitClient {
const WebKit::WebURL& url);
virtual size_t memoryUsageMB();
virtual bool rawCookies(const WebKit::WebURL& url,
- const WebKit::WebURL& policy_url,
+ const WebKit::WebURL& first_party_for_cookies,
WebKit::WebVector<WebKit::WebCookie>*);
virtual void deleteCookie(const WebKit::WebURL& url,
const WebKit::WebString& cookie_name);
diff --git a/webkit/glue/webplugin.h b/webkit/glue/webplugin.h
index b301dde..194b99d 100644
--- a/webkit/glue/webplugin.h
+++ b/webkit/glue/webplugin.h
@@ -79,10 +79,10 @@ class WebPlugin {
// Cookies
virtual void SetCookie(const GURL& url,
- const GURL& policy_url,
+ const GURL& first_party_for_cookies,
const std::string& cookie) = 0;
virtual std::string GetCookies(const GURL& url,
- const GURL& policy_url) = 0;
+ const GURL& first_party_for_cookies) = 0;
// Shows a modal HTML dialog containing the given URL. json_arguments are
// passed to the dialog via the DOM 'window.chrome.dialogArguments', and the
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc
index 37f34c2..3b327b3 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/webplugin_impl.cc
@@ -557,14 +557,16 @@ NPObject* WebPluginImpl::GetPluginElement() {
}
void WebPluginImpl::SetCookie(const GURL& url,
- const GURL& policy_url,
+ const GURL& first_party_for_cookies,
const std::string& cookie) {
WebKit::webKitClient()->setCookies(
- url, policy_url, WebString::fromUTF8(cookie));
+ url, first_party_for_cookies, WebString::fromUTF8(cookie));
}
-std::string WebPluginImpl::GetCookies(const GURL& url, const GURL& policy_url) {
- return UTF16ToUTF8(WebKit::webKitClient()->cookies(url, policy_url));
+std::string WebPluginImpl::GetCookies(const GURL& url,
+ const GURL& first_party_for_cookies) {
+ return UTF16ToUTF8(WebKit::webKitClient()->cookies(url,
+ first_party_for_cookies));
}
void WebPluginImpl::ShowModalHTMLDialog(const GURL& url, int width, int height,
diff --git a/webkit/glue/webplugin_impl.h b/webkit/glue/webplugin_impl.h
index 5bbc39f..af0d021 100644
--- a/webkit/glue/webplugin_impl.h
+++ b/webkit/glue/webplugin_impl.h
@@ -137,10 +137,10 @@ class WebPluginImpl : public WebPlugin,
NPObject* GetPluginElement();
void SetCookie(const GURL& url,
- const GURL& policy_url,
+ const GURL& first_party_for_cookies,
const std::string& cookie);
std::string GetCookies(const GURL& url,
- const GURL& policy_url);
+ const GURL& first_party_for_cookies);
void ShowModalHTMLDialog(const GURL& url, int width, int height,
const std::string& json_arguments,
generated by cgit v1.1 at 2025-02-01 00:46:04 +0000