Merge webkit.org at r55033 : Initial merge by git

Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5

1 files changed, 10 insertions, 6 deletions

diff --git a/WebKit/chromium/public/WebKitClient.h b/WebKit/chromium/public/WebKitClient.h
index fbaa218..c5a04b2 100644
--- a/WebKit/chromium/public/WebKitClient.h
+++ b/WebKit/chromium/public/WebKitClient.h
@@ -49,6 +49,7 @@ namespace WebKit {
 class WebApplicationCacheHost;
 class WebApplicationCacheHostClient;
 class WebClipboard;
+class WebCookieJar;
 class WebMessagePortChannel;
 class WebMimeRegistry;
 class WebPluginListBuilder;
@@ -75,6 +76,9 @@ public:
     // May return null on some platforms.
     virtual WebThemeEngine* themeEngine() { return 0; }
 
+    // May return null.
+    virtual WebCookieJar* cookieJar() { return 0; }
+
 
     // Application Cache --------------------------------------------
 
@@ -177,12 +181,12 @@ public:
 
     // Network -------------------------------------------------------------
 
-    virtual void setCookies(
-        const WebURL& url, const WebURL& firstPartyForCookies, const WebString& cookies) { }
-    virtual WebString cookies(const WebURL& url, const WebURL& firstPartyForCookies) { return WebString(); }
-    virtual bool rawCookies(const WebURL& url, const WebURL& firstPartyForCookies, WebVector<WebCookie>*) { return false; }
-    virtual void deleteCookie(const WebURL& url, const WebString& cookieName) { }
-    virtual bool cookiesEnabled(const WebURL& url, const WebURL& firstPartyForCookies) { return true; }
+    // These cookie methods are DEPRECATED in favor of cookieJar accessor.
+    virtual void setCookies(const WebURL&, const WebURL& firstPartyForCookies, const WebString& cookies) { }
+    virtual WebString cookies(const WebURL&, const WebURL& firstPartyForCookies) { return WebString(); }
+    virtual bool rawCookies(const WebURL&, const WebURL& firstPartyForCookies, WebVector<WebCookie>*) { return false; }
+    virtual void deleteCookie(const WebURL&, const WebString& cookieName) { }
+    virtual bool cookiesEnabled(const WebURL&, const WebURL& firstPartyForCookies) { return true; }
 
     // A suggestion to prefetch IP information for the given hostname.
     virtual void prefetchHostName(const WebString&) { }