summaryrefslogtreecommitdiffstats
path: root/webkit/api
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-22 22:57:06 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-22 22:57:06 +0000
commitc284946e12e85a287e5095bde26efa72e84bb56b (patch)
tree0a76345f76d71dabbed651b4ee757f47b87db7df /webkit/api
parentfb19f9c85ab72f6ffc42dc7576db21c958eccea3 (diff)
downloadchromium_src-c284946e12e85a287e5095bde26efa72e84bb56b.zip
chromium_src-c284946e12e85a287e5095bde26efa72e84bb56b.tar.gz
chromium_src-c284946e12e85a287e5095bde26efa72e84bb56b.tar.bz2
Roll DEPS and fix build bustage. Propagate rename of policyBaseURL -> firstPartyForCookies a bit further.
TBR=darin TEST=It complies! BUG=None Review URL: http://codereview.chromium.org/112055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/api')
-rw-r--r--webkit/api/public/WebURLRequest.h4
-rw-r--r--webkit/api/src/ChromiumBridge.cpp10
2 files changed, 8 insertions, 6 deletions
diff --git a/webkit/api/public/WebURLRequest.h b/webkit/api/public/WebURLRequest.h
index 5728eb6..c7b9bec 100644
--- a/webkit/api/public/WebURLRequest.h
+++ b/webkit/api/public/WebURLRequest.h
@@ -76,8 +76,8 @@ namespace WebKit {
WEBKIT_API void setURL(const WebURL&) = 0;
// Used to implement third-party cookie blocking.
- WEBKIT_API WebURL policyBaseURL() const = 0;
- WEBKIT_API void setPolicyBaseURL(const WebURL&) = 0;
+ WEBKIT_API WebURL firstPartyForCookies() const = 0;
+ WEBKIT_API void setFirstPartyForCookies(const WebURL&) = 0;
WEBKIT_API CachePolicy cachePolicy() const = 0;
WEBKIT_API void setCachePolicy(CachePolicy) = 0;
diff --git a/webkit/api/src/ChromiumBridge.cpp b/webkit/api/src/ChromiumBridge.cpp
index 38e2d3a..5469747 100644
--- a/webkit/api/src/ChromiumBridge.cpp
+++ b/webkit/api/src/ChromiumBridge.cpp
@@ -123,15 +123,17 @@ void ChromiumBridge::clipboardWriteImage(const NativeImageSkia* image,
// Cookies --------------------------------------------------------------------
-void ChromiumBridge::setCookies(const KURL& url, const KURL& policyURL,
+void ChromiumBridge::setCookies(const KURL& url,
+ const KURL& firstPartyForCookies,
const String& cookie)
{
- webKitClient()->setCookies(url, policyURL, cookie);
+ webKitClient()->setCookies(url, firstPartyForCookies, cookie);
}
-String ChromiumBridge::cookies(const KURL& url, const KURL& policyURL)
+String ChromiumBridge::cookies(const KURL& url,
+ const KURL& firstPartyForCookies)
{
- return webKitClient()->cookies(url, policyURL);
+ return webKitClient()->cookies(url, firstPartyForCookies);
}
// DNS ------------------------------------------------------------------------