Changeset 55298 in webkit

Timestamp:

Feb 26, 2010 12:20:35 PM (14 years ago)

Author:

alex

Message:

Unreviewed.

Reverted last patch (r55295), it causes problems with the frames.

• WebCoreSupport/ChromeClientGtk.cpp:

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/ChromeClientGtk.cpp (modified) (1 diff)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-02-26  Alejandro G. Castro  <alex@igalia.com>
+
+        Unreviewed.
+
+        Reverted last patch (r55295), it causes problems with the frames.
+
+        * WebCoreSupport/ChromeClientGtk.cpp:
+
 2010-02-19  Alejandro G. Castro  <alex@igalia.com>
 

trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

@@ -365 +365 @@
     // scroll the whole window at once, and we often need to scroll
     // portions of the window only (think frames).
-    GdkRectangle moveRect = clipRect;
-    GdkRegion* moveRegion = gdk_region_rectangle(&moveRect);
-    gdk_window_move_region(window, moveRegion, delta.width(), delta.height());
-    gdk_region_destroy(moveRegion);
+    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);
 }