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

[hamaji at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 638fee606cbbe349c69a0dffc1eeb64dc101db2d
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 18 13:09:28 2010 +0000

    2010-08-18  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r65238.
            http://trac.webkit.org/changeset/65238
            https://bugs.webkit.org/show_bug.cgi?id=44168
    
            Check if clobbering chromium bot fixes the layout test
            failures (Requested by hamaji on #webkit).
    
            * public/WebFrameClient.h:
            (WebKit::WebFrameClient::frameDetached):
            * src/FrameLoaderClientImpl.cpp:
            (WebKit::FrameLoaderClientImpl::detachedFromParent3):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65604 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index b6aeb6c..a171300 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,19 @@
 2010-08-18  Sheriff Bot  <webkit.review.bot at gmail.com>
 
+        Unreviewed, rolling out r65238.
+        http://trac.webkit.org/changeset/65238
+        https://bugs.webkit.org/show_bug.cgi?id=44168
+
+        Check if clobbering chromium bot fixes the layout test
+        failures (Requested by hamaji on #webkit).
+
+        * public/WebFrameClient.h:
+        (WebKit::WebFrameClient::frameDetached):
+        * src/FrameLoaderClientImpl.cpp:
+        (WebKit::FrameLoaderClientImpl::detachedFromParent3):
+
+2010-08-18  Sheriff Bot  <webkit.review.bot at gmail.com>
+
         Unreviewed, rolling out r65595.
         http://trac.webkit.org/changeset/65595
         https://bugs.webkit.org/show_bug.cgi?id=44161
diff --git a/WebKit/chromium/public/WebFrameClient.h b/WebKit/chromium/public/WebFrameClient.h
index 2b7ee0d..91f0e38 100644
--- a/WebKit/chromium/public/WebFrameClient.h
+++ b/WebKit/chromium/public/WebFrameClient.h
@@ -90,6 +90,12 @@ public:
 
     // General notifications -----------------------------------------------
 
+    // This frame has been detached from the view.
+    //
+    // FIXME: Do not use this in new code. Currently this is used by code in
+    // Chromium that errantly caches WebKit objects.
+    virtual void frameDetached(WebFrame*) { }
+
     // This frame is about to be closed.
     virtual void willClose(WebFrame*) { }
 
diff --git a/WebKit/chromium/src/FrameLoaderClientImpl.cpp b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
index db74080..74186bf 100644
--- a/WebKit/chromium/src/FrameLoaderClientImpl.cpp
+++ b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
@@ -248,7 +248,12 @@ void FrameLoaderClientImpl::detachedFromParent3()
     // go to a page and then navigate to a new page without getting any asserts
     // or crashes.
     m_webFrame->frame()->script()->proxy()->clearForClose();
-    
+
+    // Alert the client that the frame is being detached. This is the last
+    // chance we have to communicate with the client.
+    if (m_webFrame->client())
+        m_webFrame->client()->frameDetached(m_webFrame);
+
     // Stop communicating with the WebFrameClient at this point since we are no
     // longer associated with the Page.
     m_webFrame->setClient(0);

-- 
WebKit Debian packaging