[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[xan at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit ea4c1c20a31a7b8f92c6fef98aea35a7871cbf61
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 20 23:51:49 2009 +0000

    2009-12-20  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Gustavo Noronha.
    
            Unset the adjustments in our FrameView when detaching from
            parent. Fixes some crashers when transitioning to a new page from
            a scrolled page.
    
            * WebCoreSupport/FrameLoaderClientGtk.cpp:
            (WebKit::FrameLoaderClient::detachedFromParent2):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52428 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index eabba9f..6fd2fd3 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -10,6 +10,17 @@
 
 2009-12-20  Xan Lopez  <xlopez at igalia.com>
 
+        Reviewed by Gustavo Noronha.
+
+        Unset the adjustments in our FrameView when detaching from
+        parent. Fixes some crashers when transitioning to a new page from
+        a scrolled page.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::detachedFromParent2):
+
+2009-12-20  Xan Lopez  <xlopez at igalia.com>
+
         Rubber-stamped by Gustavo Noronha.
 
         Disable the page cache by default since:
diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
index 1a3267b..a690d80 100644
--- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
@@ -640,7 +640,9 @@ void FrameLoaderClient::setCopiesOnScroll()
 
 void FrameLoaderClient::detachedFromParent2()
 {
-    notImplemented();
+    FrameView *view = core(m_frame)->view();
+    if (view)
+        view->setGtkAdjustments(0, 0);
 }
 
 void FrameLoaderClient::detachedFromParent3()

-- 
WebKit Debian packaging