WebKit merge 41447:41498 [third_party/WebKit]

third_party/WebKit/WebCore/platform/gtk/ScrollbarGtk.cpp

 /*
  *  Copyright (C) 2007 Holger Hans Peter Freyther zecke@selfish.org
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 52 matching lines @@
      */
     resize(ScrollbarTheme::nativeTheme()->scrollbarThickness(),
            ScrollbarTheme::nativeTheme()->scrollbarThickness());
 }
 
 void ScrollbarGtk::frameRectsChanged()
 {
     if (!parent())
         return;
 
-    IntPoint loc;
-
-    /*
-     * The same scrollbars are used for ScrollViews and 'floating divs'/
-     * RenderLayout. We need to take this into account to decide which
-     * function to use to transform the location coordinates.
-     * The basic difference is that RenderLayout scrollbars need to have
-     * substracted the scrollOffset() from their location.
-     */
-    if (parent()->isScrollViewScrollbar(this))
-        loc = parent()->convertToContainingWindow(frameRect().location());
-    else
-        loc = parent()->contentsToWindow(frameRect().location());
+    // Translate our coordinates, we are a RenderLayout scrollbar because our
+    // ScrollView scrollbars are native.
+    IntPoint loc = parent()->contentsToWindow(frameRect().location());
 
     // Don't allow the allocation size to be negative
     IntSize sz = frameRect().size();
     sz.clampNegativeToZero();
 
     GtkAllocation allocation = { loc.x(), loc.y(), sz.width(), sz.height() };
     gtk_widget_size_allocate(platformWidget(), &allocation);
 }
 
 void ScrollbarGtk::updateThumbPosition()
@@ skipping 27 matching lines @@
 void ScrollbarGtk::setEnabled(bool shouldEnable)
 {
     if (enabled() == shouldEnable)
         return;
         
     Scrollbar::setEnabled(shouldEnable);
     if (platformWidget()) 
         gtk_widget_set_sensitive(platformWidget(), shouldEnable);
 }
 
+/*
+ * 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& rect)
+{
+    if (!platformWidget())
+        return;
 
+    if (!context->gdkExposeEvent())
+        return;
 
+    GtkWidget* widget = platformWidget();
+    ASSERT(GTK_WIDGET_NO_WINDOW(widget));
+
+    GdkEvent* event = gdk_event_new(GDK_EXPOSE);
+    event->expose = *context->gdkExposeEvent();
+    event->expose.area = static_cast<GdkRectangle>(rect);
+
+    IntPoint loc = parent()->contentsToWindow(rect.location());
+    event->expose.area.x = loc.x();
+    event->expose.area.y = loc.y();
+
+    event->expose.region = gdk_region_rectangle(&event->expose.area);
+
+    /*
+     * This will be unref'ed by gdk_event_free.
+     */
+    g_object_ref(event->expose.window);
+
+    /*
+     * If we are going to paint do the translation and GtkAllocation manipulation.
+     */
+    if (!gdk_region_empty(event->expose.region))
+        gtk_widget_send_expose(widget, event);
+
+    gdk_event_free(event);
+}