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

hamaji at chromium.org hamaji at chromium.org
Wed Dec 22 11:58:41 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit d3c1c158743d10a2ad53532f03f9df0430ddba54
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 12 12:36:52 2010 +0000

    2010-08-12  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r65181.
            http://trac.webkit.org/changeset/65181
            https://bugs.webkit.org/show_bug.cgi?id=43909
    
            It broke 35 layout tests fail on chromium-win (Requested by
            hamaji on #webkit).
    
            * public/WebFrameClient.h:
            * src/FrameLoaderClientImpl.cpp:
            (WebKit::FrameLoaderClientImpl::detachedFromParent3):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65238 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index eb24668..6631b0b 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,18 @@
 2010-08-12  Sheriff Bot  <webkit.review.bot at gmail.com>
 
+        Unreviewed, rolling out r65181.
+        http://trac.webkit.org/changeset/65181
+        https://bugs.webkit.org/show_bug.cgi?id=43909
+
+        It broke 35 layout tests fail on chromium-win (Requested by
+        hamaji on #webkit).
+
+        * public/WebFrameClient.h:
+        * src/FrameLoaderClientImpl.cpp:
+        (WebKit::FrameLoaderClientImpl::detachedFromParent3):
+
+2010-08-12  Sheriff Bot  <webkit.review.bot at gmail.com>
+
         Unreviewed, rolling out r65221.
         http://trac.webkit.org/changeset/65221
         https://bugs.webkit.org/show_bug.cgi?id=43896
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 74186bf..db74080 100644
--- a/WebKit/chromium/src/FrameLoaderClientImpl.cpp
+++ b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
@@ -248,12 +248,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.
-    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



More information about the Pkg-webkit-commits mailing list