diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/renderer/renderer_glue.cc | 11 | ||||
| -rw-r--r-- | webkit/glue/chromium_bridge_impl.cc | 16 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.h | 12 | ||||
| -rw-r--r-- | webkit/tools/test_shell/simple_resource_loader_bridge.cc | 9 |
5 files changed, 1 insertions, 49 deletions
@@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@167", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@10973", + "/trunk/deps/third_party/WebKit@10995", "src/third_party/icu38": "/trunk/deps/third_party/icu38@10692", diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc index 5f63123..9508c50 100644 --- a/chrome/renderer/renderer_glue.cc +++ b/chrome/renderer/renderer_glue.cc @@ -302,17 +302,6 @@ ResourceLoaderBridge* ResourceLoaderBridge::Create( mixed_content, 0); } -void SetCookie(const GURL& url, const GURL& policy_url, - const std::string& cookie) { - RenderThread::current()->Send(new ViewHostMsg_SetCookie(url, policy_url, cookie)); -} - -std::string GetCookies(const GURL& url, const GURL& policy_url) { - std::string cookies; - RenderThread::current()->Send(new ViewHostMsg_GetCookies(url, policy_url, &cookies)); - return cookies; -} - void NotifyCacheStats() { // Update the browser about our cache // NOTE: Since this can be called from the plugin process, we might not have diff --git a/webkit/glue/chromium_bridge_impl.cc b/webkit/glue/chromium_bridge_impl.cc index 4675e79..f832150 100644 --- a/webkit/glue/chromium_bridge_impl.cc +++ b/webkit/glue/chromium_bridge_impl.cc @@ -97,22 +97,6 @@ ChromeClientImpl* ToChromeClient(WebCore::Widget* widget) { namespace WebCore { -// Cookies -------------------------------------------------------------------- - -void ChromiumBridge::setCookies( - const KURL& url, const KURL& policy_url, const String& cookie) { - webkit_glue::SetCookie( - webkit_glue::KURLToGURL(url), - webkit_glue::KURLToGURL(policy_url), - webkit_glue::StringToStdString(cookie)); -} - -String ChromiumBridge::cookies(const KURL& url, const KURL& policy_url) { - return webkit_glue::StdStringToString(webkit_glue::GetCookies( - webkit_glue::KURLToGURL(url), - webkit_glue::KURLToGURL(policy_url))); -} - // Font ----------------------------------------------------------------------- #if defined(OS_WIN) diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index 07aba30..003b0da 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -150,18 +150,6 @@ void PrecacheUrl(const char16* url, int url_length); // This function is called to add a line to the application's log file. void AppendToLog(const char* filename, int line, const char* message); -// Sets a cookie string for the given URL. The policy_url argument indicates -// the URL of the topmost frame, which may be useful for determining whether or -// not to allow this cookie setting. NOTE: the cookie string is a standard -// cookie string of the form "name=value; option1=x; option2=y" -void SetCookie(const GURL& url, const GURL& policy_url, - const std::string& cookie); - -// Returns all cookies in the form "a=1; b=2; c=3" for the given URL. NOTE: -// this string should not include any options that may have been specified when -// the cookie was set. Semicolons delimit individual cookies in this context. -std::string GetCookies(const GURL& url, const GURL& policy_url); - // Gather usage statistics from the in-memory cache and inform our host, if // applicable. void NotifyCacheStats(); diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc index 696502b..f6b10f3 100644 --- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc +++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc @@ -516,15 +516,6 @@ bool FindProxyForUrl(const GURL& url, std::string* proxy_list) { return rv == net::OK; } -void SetCookie(const GURL& url, const GURL& policy_url, - const std::string& cookie) { - SimpleResourceLoaderBridge::SetCookie(url, policy_url, cookie); -} - -std::string GetCookies(const GURL& url, const GURL& policy_url) { - return SimpleResourceLoaderBridge::GetCookies(url, policy_url); -} - } // namespace webkit_glue //----------------------------------------------------------------------------- |