Name all the GLib timeout sources
[WebKit-https.git] / Source / WebCore / platform / gtk / ScrollbarThemeGtk2.cpp
index e1ffa71..866bb8a 100644 (file)
@@ -28,6 +28,7 @@
 
 #ifdef GTK_API_VERSION_2
 
 
 #ifdef GTK_API_VERSION_2
 
+#include "GtkVersioning.h"
 #include "PlatformMouseEvent.h"
 #include "RenderThemeGtk.h"
 #include "ScrollView.h"
 #include "PlatformMouseEvent.h"
 #include "RenderThemeGtk.h"
 #include "ScrollView.h"
@@ -57,19 +58,21 @@ void ScrollbarThemeGtk::updateThemeProperties()
                          "trough_border", &m_troughBorderWidth,
                          "stepper-size", &m_stepperSize,
                          "trough-under-steppers", &m_troughUnderSteppers,
                          "trough_border", &m_troughBorderWidth,
                          "stepper-size", &m_stepperSize,
                          "trough-under-steppers", &m_troughUnderSteppers,
+                         "has-backward-stepper", &m_hasBackButtonStartPart,
+                         "has-forward-stepper", &m_hasForwardButtonEndPart,
                          "has-secondary-forward-stepper", &m_hasForwardButtonStartPart,
                          "has-secondary-backward-stepper", &m_hasBackButtonEndPart, NULL);
     m_minThumbLength = gtk_range_get_min_slider_size(GTK_RANGE(scrollbar));
     updateScrollbarsFrameThickness();
 }
 
                          "has-secondary-forward-stepper", &m_hasForwardButtonStartPart,
                          "has-secondary-backward-stepper", &m_hasBackButtonEndPart, NULL);
     m_minThumbLength = gtk_range_get_min_slider_size(GTK_RANGE(scrollbar));
     updateScrollbarsFrameThickness();
 }
 
-static GtkWidget* getWidgetForScrollbar(Scrollbar* scrollbar)
+static GtkWidget* getWidgetForScrollbar(ScrollbarThemeClient* scrollbar)
 {
     RenderThemeGtk* theme = static_cast<RenderThemeGtk*>(RenderTheme::defaultTheme().get());
     return scrollbar->orientation() == VerticalScrollbar ? theme->gtkVScrollbar() : theme->gtkHScrollbar();
 }
 
 {
     RenderThemeGtk* theme = static_cast<RenderThemeGtk*>(RenderTheme::defaultTheme().get());
     return scrollbar->orientation() == VerticalScrollbar ? theme->gtkVScrollbar() : theme->gtkHScrollbar();
 }
 
-void ScrollbarThemeGtk::paintTrackBackground(GraphicsContext* context, Scrollbar* scrollbar, const IntRect& rect)
+void ScrollbarThemeGtk::paintTrackBackground(GraphicsContext* context, ScrollbarThemeClient* scrollbar, const IntRect& rect)
 {
     // Paint the track background. If the trough-under-steppers property is true, this
     // should be the full size of the scrollbar, but if is false, it should only be the
 {
     // Paint the track background. If the trough-under-steppers property is true, this
     // should be the full size of the scrollbar, but if is false, it should only be the
@@ -84,7 +87,7 @@ void ScrollbarThemeGtk::paintTrackBackground(GraphicsContext* context, Scrollbar
                               GTK_STATE_ACTIVE, GTK_SHADOW_IN, "trough");
 }
 
                               GTK_STATE_ACTIVE, GTK_SHADOW_IN, "trough");
 }
 
-void ScrollbarThemeGtk::paintScrollbarBackground(GraphicsContext* context, Scrollbar* scrollbar)
+void ScrollbarThemeGtk::paintScrollbarBackground(GraphicsContext* context, ScrollbarThemeClient* scrollbar)
 {
     IntRect fullScrollbarRect = IntRect(scrollbar->x(), scrollbar->y(), scrollbar->width(), scrollbar->height());
 
 {
     IntRect fullScrollbarRect = IntRect(scrollbar->x(), scrollbar->y(), scrollbar->width(), scrollbar->height());
 
@@ -93,7 +96,7 @@ void ScrollbarThemeGtk::paintScrollbarBackground(GraphicsContext* context, Scrol
                               GTK_STATE_NORMAL, GTK_SHADOW_IN, "scrolled_window");
 }
 
                               GTK_STATE_NORMAL, GTK_SHADOW_IN, "scrolled_window");
 }
 
-void ScrollbarThemeGtk::paintThumb(GraphicsContext* context, Scrollbar* scrollbar, const IntRect& rect)
+void ScrollbarThemeGtk::paintThumb(GraphicsContext* context, ScrollbarThemeClient* scrollbar, const IntRect& rect)
 {
     GtkWidget* widget = getWidgetForScrollbar(scrollbar);
     gboolean activateSlider;
 {
     GtkWidget* widget = getWidgetForScrollbar(scrollbar);
     gboolean activateSlider;
@@ -126,7 +129,7 @@ void ScrollbarThemeGtk::paintThumb(GraphicsContext* context, Scrollbar* scrollba
     widgetContext.gtkPaintSlider(sliderRect, widget, stateType, shadowType, "slider", orientation);
 }
 
     widgetContext.gtkPaintSlider(sliderRect, widget, stateType, shadowType, "slider", orientation);
 }
 
-void ScrollbarThemeGtk::paintButton(GraphicsContext* context, Scrollbar* scrollbar, const IntRect& rect, ScrollbarPart part)
+void ScrollbarThemeGtk::paintButton(GraphicsContext* context, ScrollbarThemeClient* scrollbar, const IntRect& rect, ScrollbarPart part)
 {
     // The buttons will be disabled if the thumb is as the appropriate extreme.
     GtkShadowType shadowType = GTK_SHADOW_OUT;
 {
     // The buttons will be disabled if the thumb is as the appropriate extreme.
     GtkShadowType shadowType = GTK_SHADOW_OUT;