<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[41491] trunk/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/41491">41491</a></dd>
<dt>Author</dt> <dd>xan@webkit.org</dd>
<dt>Date</dt> <dd>2009-03-06 11:06:19 -0800 (Fri, 06 Mar 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-03-04  Xan Lopez  &lt;xan@gnome.org&gt;

        Reviewed by Holger Freyther.

        https://bugs.webkit.org/show_bug.cgi?id=24358
        [GTK] Scrollbars not clipped correctly

        Move Widget::paint to ScrollbarGtk::paint, since it's scrollbar
        specific and it's our only Widget anyway.

        * platform/gtk/ScrollbarGtk.cpp:
        (ScrollbarGtk::paint):
        * platform/gtk/ScrollbarGtk.h:
        * platform/gtk/WidgetGtk.cpp:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformgtkScrollbarGtkcpp">trunk/WebCore/platform/gtk/ScrollbarGtk.cpp</a></li>
<li><a href="#trunkWebCoreplatformgtkScrollbarGtkh">trunk/WebCore/platform/gtk/ScrollbarGtk.h</a></li>
<li><a href="#trunkWebCoreplatformgtkWidgetGtkcpp">trunk/WebCore/platform/gtk/WidgetGtk.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (41490 => 41491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-03-06 19:06:05 UTC (rev 41490)
+++ trunk/WebCore/ChangeLog        2009-03-06 19:06:19 UTC (rev 41491)
</span><span class="lines">@@ -5,6 +5,21 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=24358
</span><span class="cx">         [GTK] Scrollbars not clipped correctly
</span><span class="cx"> 
</span><ins>+        Move Widget::paint to ScrollbarGtk::paint, since it's scrollbar
+        specific and it's our only Widget anyway.
+
+        * platform/gtk/ScrollbarGtk.cpp:
+        (ScrollbarGtk::paint):
+        * platform/gtk/ScrollbarGtk.h:
+        * platform/gtk/WidgetGtk.cpp:
+
+2009-03-04  Xan Lopez  &lt;xan@gnome.org&gt;
+
+        Reviewed by Holger Freyther.
+
+        https://bugs.webkit.org/show_bug.cgi?id=24358
+        [GTK] Scrollbars not clipped correctly
+
</ins><span class="cx">         Use correct clip rectangle and apply coordinate translation needed
</span><span class="cx">         for non-ScrollView scrollbars.
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCoreplatformgtkScrollbarGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/gtk/ScrollbarGtk.cpp (41490 => 41491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/gtk/ScrollbarGtk.cpp        2009-03-06 19:06:05 UTC (rev 41490)
+++ trunk/WebCore/platform/gtk/ScrollbarGtk.cpp        2009-03-06 19:06:19 UTC (rev 41491)
</span><span class="lines">@@ -130,5 +130,43 @@
</span><span class="cx">         gtk_widget_set_sensitive(platformWidget(), shouldEnable);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+/*
+ * Strategy to painting a Widget:
+ *  1.) do not paint if there is no GtkWidget set
+ *  2.) We assume that GTK_NO_WINDOW is set and that frameRectsChanged positioned
+ *      the widget correctly. ATM we do not honor the GraphicsContext translation.
+ */
+void ScrollbarGtk::paint(GraphicsContext* context, const IntRect&amp; rect)
+{
+    if (!platformWidget())
+        return;
</ins><span class="cx"> 
</span><ins>+    if (!context-&gt;gdkExposeEvent())
+        return;
</ins><span class="cx"> 
</span><ins>+    GtkWidget* widget = platformWidget();
+    ASSERT(GTK_WIDGET_NO_WINDOW(widget));
+
+    GdkEvent* event = gdk_event_new(GDK_EXPOSE);
+    event-&gt;expose = *context-&gt;gdkExposeEvent();
+    event-&gt;expose.area = static_cast&lt;GdkRectangle&gt;(rect);
+
+    IntPoint loc = parent()-&gt;contentsToWindow(rect.location());
+    event-&gt;expose.area.x = loc.x();
+    event-&gt;expose.area.y = loc.y();
+
+    event-&gt;expose.region = gdk_region_rectangle(&amp;event-&gt;expose.area);
+
+    /*
+     * This will be unref'ed by gdk_event_free.
+     */
+    g_object_ref(event-&gt;expose.window);
+
+    /*
+     * If we are going to paint do the translation and GtkAllocation manipulation.
+     */
+    if (!gdk_region_empty(event-&gt;expose.region))
+        gtk_widget_send_expose(widget, event);
+
+    gdk_event_free(event);
+}
</ins></span></pre></div>
<a id="trunkWebCoreplatformgtkScrollbarGtkh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/gtk/ScrollbarGtk.h (41490 => 41491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/gtk/ScrollbarGtk.h        2009-03-06 19:06:05 UTC (rev 41490)
+++ trunk/WebCore/platform/gtk/ScrollbarGtk.h        2009-03-06 19:06:19 UTC (rev 41491)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx">     friend class Scrollbar;
</span><span class="cx"> 
</span><span class="cx">     virtual void setFrameRect(const IntRect&amp;);
</span><ins>+    virtual void paint(GraphicsContext*, const IntRect&amp;);
</ins><span class="cx">     
</span><span class="cx">     virtual bool handleMouseMoveEvent(const PlatformMouseEvent&amp;) { return false; }
</span><span class="cx">     virtual bool handleMouseOutEvent(const PlatformMouseEvent&amp;) { return false; }
</span></span></pre></div>
<a id="trunkWebCoreplatformgtkWidgetGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/gtk/WidgetGtk.cpp (41490 => 41491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/gtk/WidgetGtk.cpp        2009-03-06 19:06:05 UTC (rev 41490)
+++ trunk/WebCore/platform/gtk/WidgetGtk.cpp        2009-03-06 19:06:19 UTC (rev 41491)
</span><span class="lines">@@ -95,45 +95,8 @@
</span><span class="cx">     gtk_widget_hide(platformWidget());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-/*
- * Strategy to painting a Widget:
- *  1.) do not paint if there is no GtkWidget set
- *  2.) We assume that GTK_NO_WINDOW is set and that frameRectsChanged positioned
- *      the widget correctly. ATM we do not honor the GraphicsContext translation.
- */
</del><span class="cx"> void Widget::paint(GraphicsContext* context, const IntRect&amp; rect)
</span><span class="cx"> {
</span><del>-    if (!platformWidget())
-        return;
-
-    if (!context-&gt;gdkExposeEvent())
-        return;
-
-    GtkWidget* widget = platformWidget();
-    ASSERT(GTK_WIDGET_NO_WINDOW(widget));
-
-    GdkEvent* event = gdk_event_new(GDK_EXPOSE);
-    event-&gt;expose = *context-&gt;gdkExposeEvent();
-    event-&gt;expose.area = static_cast&lt;GdkRectangle&gt;(rect);
-
-    IntPoint loc = parent()-&gt;contentsToWindow(rect.location());
-    event-&gt;expose.area.x = loc.x();
-    event-&gt;expose.area.y = loc.y();
-
-    event-&gt;expose.region = gdk_region_rectangle(&amp;event-&gt;expose.area);
-
-    /*
-     * This will be unref'ed by gdk_event_free.
-     */
-    g_object_ref(event-&gt;expose.window);
-
-    /*
-     * If we are going to paint do the translation and GtkAllocation manipulation.
-     */
-    if (!gdk_region_empty(event-&gt;expose.region))
-        gtk_widget_send_expose(widget, event);
-
-    gdk_event_free(event);
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void Widget::setIsSelected(bool)
</span></span></pre>
</div>
</div>

</body>
</html>