[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit ce9be51de30d3d9e98eff95b7600b84a473d9472
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 1 22:07:45 2010 +0000

    2010-03-01  Kalle Vahlman  <zuh at iki.fi>
    
            Reviewed by Gustavo Noronha Silva.
    
            Queue a resize when either of the content dimensions change
            https://bugs.webkit.org/show_bug.cgi?id=35489
    
            The check for size changes only queued a resize if both of the content
            dimensions change, leaving the widget size out-of-sync if eg. only the
            width changes.
    
            * WebCoreSupport/ChromeClientGtk.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55378 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index f43d084..643ec9a 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-01  Kalle Vahlman  <zuh at iki.fi>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Queue a resize when either of the content dimensions change
+        https://bugs.webkit.org/show_bug.cgi?id=35489
+
+        The check for size changes only queued a resize if both of the content
+        dimensions change, leaving the widget size out-of-sync if eg. only the
+        width changes.
+
+        * WebCoreSupport/ChromeClientGtk.cpp:
+
 2009-12-04  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Xan Lopez.
diff --git a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
index 74f5e07..d4cce8a 100644
--- a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
@@ -429,9 +429,9 @@ void ChromeClient::contentsSizeChanged(Frame* frame, const IntSize& size) const
     // We need to queue a resize request only if the size changed,
     // otherwise we get into an infinite loop!
     GtkWidget* widget = GTK_WIDGET(m_webView);
-    if (GTK_WIDGET_REALIZED(widget) &&
-        (widget->requisition.height != size.height()) &&
-        (widget->requisition.width != size.width()))
+    if (GTK_WIDGET_REALIZED(widget)
+        && (widget->requisition.height != size.height())
+        || (widget->requisition.width != size.width()))
         gtk_widget_queue_resize_no_redraw(widget);
 }
 

-- 
WebKit Debian packaging