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

[alex at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 90f46da4a731888eba6d258fae0f6f7f37d00b6c
Author: alex at webkit.org <alex at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 26 18:54:02 2010 +0000

    [GTK] Some region checks in scroll are not required
    https://bugs.webkit.org/show_bug.cgi?id=35142
    
    Reviewed by Xan Lopez.
    
    Removes some of the operations checking the moved and invalidated
    regions when scrolling, it is done already in
    gdk_window_move_region.
    
    * WebCoreSupport/ChromeClientGtk.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55295 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 04080ea..5f23bf8 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-19  Alejandro G. Castro  <alex at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Some region checks in scroll are not required
+        https://bugs.webkit.org/show_bug.cgi?id=35142
+
+        Removes some of the operations checking the moved and invalidated
+        regions when scrolling, it is done already in
+        gdk_window_move_region.
+
+        * WebCoreSupport/ChromeClientGtk.cpp:
+
 2010-02-25  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..9e818df 100644
--- a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
@@ -364,25 +364,10 @@ void ChromeClient::scroll(const IntSize& delta, const IntRect& rectToScroll, con
     // We cannot use gdk_window_scroll here because it is only able to
     // scroll the whole window at once, and we often need to scroll
     // portions of the window only (think frames).
-    GdkRectangle area = clipRect;
-    GdkRectangle moveRect;
-
-    GdkRectangle sourceRect = area;
-    sourceRect.x -= delta.width();
-    sourceRect.y -= delta.height();
-
-    GdkRegion* invalidRegion = gdk_region_rectangle(&area);
-
-    if (gdk_rectangle_intersect(&area, &sourceRect, &moveRect)) {
-        GdkRegion* moveRegion = gdk_region_rectangle(&moveRect);
-        gdk_window_move_region(window, moveRegion, delta.width(), delta.height());
-        gdk_region_offset(moveRegion, delta.width(), delta.height());
-        gdk_region_subtract(invalidRegion, moveRegion);
-        gdk_region_destroy(moveRegion);
-    }
-
-    gdk_window_invalidate_region(window, invalidRegion, FALSE);
-    gdk_region_destroy(invalidRegion);
+    GdkRectangle moveRect = clipRect;
+    GdkRegion* moveRegion = gdk_region_rectangle(&moveRect);
+    gdk_window_move_region(window, moveRegion, delta.width(), delta.height());
+    gdk_region_destroy(moveRegion);
 }
 
 // FIXME: this does not take into account the WM decorations

-- 
WebKit Debian packaging