[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 d1ccc9890815ca2fe16d193dce2df45148e69f12
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 10 09:05:22 2010 +0000

    2010-08-10  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r64988.
            http://trac.webkit.org/changeset/64988
            https://bugs.webkit.org/show_bug.cgi?id=43775
    
            "It seems to break chromium's ui_tests" (Requested by hamaji
            on #webkit).
    
            * public/WebFrameClient.h:
            * src/FrameLoaderClientImpl.cpp:
            (WebKit::FrameLoaderClientImpl::detachedFromParent3):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65060 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index bccb42e..24102d0 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-10  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r64988.
+        http://trac.webkit.org/changeset/64988
+        https://bugs.webkit.org/show_bug.cgi?id=43775
+
+        "It seems to break chromium's ui_tests" (Requested by hamaji
+        on #webkit).
+
+        * public/WebFrameClient.h:
+        * src/FrameLoaderClientImpl.cpp:
+        (WebKit::FrameLoaderClientImpl::detachedFromParent3):
+
 2010-08-10  Yury Semikhatsky  <yurys at chromium.org>
 
         Unreviewed. Remove references to deleted header InspectorFrontend.h
diff --git a/WebKit/chromium/public/WebFrameClient.h b/WebKit/chromium/public/WebFrameClient.h
index 91f0e38..2b7ee0d 100644
--- a/WebKit/chromium/public/WebFrameClient.h
+++ b/WebKit/chromium/public/WebFrameClient.h
@@ -90,12 +90,6 @@ 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 95f2d47..b416e35 100644
--- a/WebKit/chromium/src/FrameLoaderClientImpl.cpp
+++ b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
@@ -246,11 +246,7 @@ 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.
-    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