Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (197355 => 197356)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2016-02-29 17:36:51 UTC (rev 197355)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2016-02-29 17:54:11 UTC (rev 197356)
@@ -1,3 +1,12 @@
+2016-02-29 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Unreviewed. Fix the build with GTK+ < 3.19.
+
+ * platform/gtk/ScrollbarThemeGtk3.cpp:
+ (WebCore::ScrollbarThemeGtk::paintScrollbarBackground):
+ (WebCore::ScrollbarThemeGtk::paintThumb):
+ (WebCore::ScrollbarThemeGtk::paintButton):
+
2015-02-06 Zalan Bujtas <za...@apple.com>
ASSERT repaintContainer->hasLayer() in WebCore::RenderObject::repaintUsingContainer
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/ScrollbarThemeGtk3.cpp (197355 => 197356)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/ScrollbarThemeGtk3.cpp 2016-02-29 17:36:51 UTC (rev 197355)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/ScrollbarThemeGtk3.cpp 2016-02-29 17:54:11 UTC (rev 197356)
@@ -115,12 +115,12 @@
updateScrollbarsFrameThickness();
}
+#if GTK_CHECK_VERSION(3, 19, 2)
static const char* orientationStyleClass(ScrollbarOrientation orientation)
{
return orientation == VerticalScrollbar ? "vertical" : "horizontal";
}
-
-#if !GTK_CHECK_VERSION(3, 19, 2)
+#else
static void applyScrollbarStyleContextClasses(GtkStyleContext* context, ScrollbarOrientation orientation)
{
gtk_style_context_add_class(context, GTK_STYLE_CLASS_SCROLLBAR);
@@ -197,7 +197,7 @@
gtk_render_frame(styleContext.get(), context->platformContext()->cr(), scrollbar->x(), scrollbar->y(), scrollbar->width(), scrollbar->height());
#if !GTK_CHECK_VERSION(3, 19, 2)
- gtk_style_context_restore(styleContext);
+ gtk_style_context_restore(styleContext.get());
#endif
}
@@ -242,7 +242,7 @@
orientation == VerticalScrollbar ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL);
#if !GTK_CHECK_VERSION(3, 19, 2)
- gtk_style_context_restore(styleContext);
+ gtk_style_context_restore(styleContext.get());
#endif
}
@@ -312,7 +312,7 @@
gtk_render_arrow(styleContext.get(), context->platformContext()->cr(), angle, arrowPoint.x(), arrowPoint.y(), arrowSize);
#if !GTK_CHECK_VERSION(3, 19, 2)
- gtk_style_context_restore(styleContext);
+ gtk_style_context_restore(styleContext.get());
#endif
}
