[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[jochen at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 6392a57a354807f8550fc4b43a11f4ad5d05488b
Author: jochen at chromium.org <jochen at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 30 10:36:18 2010 +0000

    2010-11-30  Jochen Eisinger  <jochen at chromium.org>
    
            Reviewed by Darin Fisher.
    
            [chromium] pass webframe to web frame client's cookieJar
            https://bugs.webkit.org/show_bug.cgi?id=50148
    
            * public/WebFrameClient.h:
            (WebKit::WebFrameClient::cookieJar):
            * src/ChromiumBridge.cpp:
            (WebCore::getCookieJar):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72901 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index ec96c6d..c89c723 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,17 @@
 2010-11-30  Jochen Eisinger  <jochen at chromium.org>
 
+        Reviewed by Darin Fisher.
+
+        [chromium] pass webframe to web frame client's cookieJar
+        https://bugs.webkit.org/show_bug.cgi?id=50148
+
+        * public/WebFrameClient.h:
+        (WebKit::WebFrameClient::cookieJar):
+        * src/ChromiumBridge.cpp:
+        (WebCore::getCookieJar):
+
+2010-11-30  Jochen Eisinger  <jochen at chromium.org>
+
         Unreviewed. Roll chromium 67532:67541.
 
         * DEPS:
diff --git a/WebKit/chromium/public/WebFrameClient.h b/WebKit/chromium/public/WebFrameClient.h
index 9063350..1c6fd04 100644
--- a/WebKit/chromium/public/WebFrameClient.h
+++ b/WebKit/chromium/public/WebFrameClient.h
@@ -86,7 +86,7 @@ public:
 
     // A frame specific cookie jar.  May return null, in which case
     // WebKitClient::cookieJar() will be called to access cookies.
-    virtual WebCookieJar* cookieJar() { return 0; }
+    virtual WebCookieJar* cookieJar(WebFrame*) { return 0; }
 
 
     // General notifications -----------------------------------------------
diff --git a/WebKit/chromium/src/ChromiumBridge.cpp b/WebKit/chromium/src/ChromiumBridge.cpp
index 4ac3f6f..e7a1305 100644
--- a/WebKit/chromium/src/ChromiumBridge.cpp
+++ b/WebKit/chromium/src/ChromiumBridge.cpp
@@ -134,7 +134,7 @@ static WebCookieJar* getCookieJar(const Document* document)
     WebFrameImpl* frameImpl = WebFrameImpl::fromFrame(document->frame());
     if (!frameImpl || !frameImpl->client())
         return 0;
-    WebCookieJar* cookieJar = frameImpl->client()->cookieJar();
+    WebCookieJar* cookieJar = frameImpl->client()->cookieJar(frameImpl);
     if (!cookieJar)
         cookieJar = webKitClient()->cookieJar();
     return cookieJar;

-- 
WebKit Debian packaging