Changeset 31185 in webkit

Timestamp:

Mar 20, 2008 2:00:24 PM (16 years ago)

Author:

alp@webkit.org

Message:

2008-03-20 Marco Barisione <​marco.barisione@collabora.co.uk>

Reviewed by Alp Toker.

​http://bugs.webkit.org/show_bug.cgi?id=17946
[GTK] Widgets are not clipped

• platform/gtk/RenderThemeGtk.cpp: (WebCore::paintMozWidget): pass the clipping rectangle to moz_gtk_widget_paint() instead of just the widget rectangle.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/gtk/RenderThemeGtk.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-20  Marco Barisione  <marco.barisione@collabora.co.uk>
+
+        Reviewed by Alp Toker.
+
+        http://bugs.webkit.org/show_bug.cgi?id=17946
+        [GTK] Widgets are not clipped
+
+        * platform/gtk/RenderThemeGtk.cpp:
+        (WebCore::paintMozWidget): pass the clipping rectangle to
+        moz_gtk_widget_paint() instead of just the widget rectangle.
+
 2008-03-20  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/platform/gtk/RenderThemeGtk.cpp

@@ -2 +2 @@
  * Copyright (C) 2007 Apple Inc.
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
+ * Copyright (C) 2008 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -156 +157 @@
     GtkTextDirection direction = gtkTextDirection(o->style()->direction());
 
-    // FIXME: Pass the real clip region.
-    return moz_gtk_widget_paint(type, i.context->gdkDrawable(), &gdkRect, &gdkRect, &mozState, flags, direction) != MOZ_GTK_SUCCESS;
+    // Find the clip rectangle
+    cairo_t *cr = i.context->platformContext();
+    double clipX1, clipX2, clipY1, clipY2;
+    cairo_clip_extents(cr, &clipX1, &clipY1, &clipX2, &clipY2);
+
+    GdkRectangle gdkClipRect;
+    gdkClipRect.width = clipX2 - clipX1;
+    gdkClipRect.height = clipY2 - clipY1;
+    IntPoint clipPos = i.context->translatePoint(IntPoint(clipX1, clipY1));
+    gdkClipRect.x = clipPos.x();
+    gdkClipRect.y = clipPos.y();
+
+    gdk_rectangle_intersect(&gdkRect, &gdkClipRect, &gdkClipRect);
+
+    return moz_gtk_widget_paint(type, i.context->gdkDrawable(), &gdkRect, &gdkClipRect, &mozState, flags, direction) != MOZ_GTK_SUCCESS;
 }