[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[xan at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit aa2755f93569d5fdb09aa30fbf6eb0515d6a7ed2
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 23 09:02:07 2010 +0000

    2010-02-23  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Gustavo Noronha.
    
            Do not do unnecessary work during size_allocate.
    
            FrameView::resize will already queue a layout, so there's no need
            to force one ourselves. On top of that, the layout function
            already adjusts the view size when needed, so there's no need to
            do that manually either. No change in the layout tests or unit
            tests after this.
    
            * webkit/webkitwebview.cpp:
            (webkit_web_view_size_allocate):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55129 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index a4aa231..9732349 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-23  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
+        Do not do unnecessary work during size_allocate.
+
+        FrameView::resize will already queue a layout, so there's no need
+        to force one ourselves. On top of that, the layout function
+        already adjusts the view size when needed, so there's no need to
+        do that manually either. No change in the layout tests or unit
+        tests after this.
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_size_allocate):
+
 2010-02-22  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Gustavo Noronha.
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index d6a8b83..bf5570d 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -632,8 +632,6 @@ static void webkit_web_view_size_allocate(GtkWidget* widget, GtkAllocation* allo
         return;
 
     frame->view()->resize(allocation->width, allocation->height);
-    frame->view()->forceLayout();
-    frame->view()->adjustViewSize();
 }
 
 static void webkit_web_view_grab_focus(GtkWidget* widget)

-- 
WebKit Debian packaging