<!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>[194370] trunk/Source/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/194370">194370</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-22 12:37:33 -0800 (Tue, 22 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/194362">r194362</a>.
https://bugs.webkit.org/show_bug.cgi?id=152508
crashes release bot (Requested by mcatanzaro on #webkit).
Reverted changeset:
"[GTK] Everything broken in GTK+ 3.19"
https://bugs.webkit.org/show_bug.cgi?id=150550
http://trac.webkit.org/changeset/194362</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkGRefPtrGtkcpp">trunk/Source/WebCore/platform/gtk/GRefPtrGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkGRefPtrGtkh">trunk/Source/WebCore/platform/gtk/GRefPtrGtk.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkScrollbarThemeGtkcpp">trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeGtkcpp">trunk/Source/WebCore/rendering/RenderThemeGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194369 => 194370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-12-22 20:04:56 UTC (rev 194369)
+++ trunk/Source/WebCore/ChangeLog        2015-12-22 20:37:33 UTC (rev 194370)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-12-22 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r194362.
+ https://bugs.webkit.org/show_bug.cgi?id=152508
+
+ crashes release bot (Requested by mcatanzaro on #webkit).
+
+ Reverted changeset:
+
+ "[GTK] Everything broken in GTK+ 3.19"
+ https://bugs.webkit.org/show_bug.cgi?id=150550
+ http://trac.webkit.org/changeset/194362
+
</ins><span class="cx"> 2015-12-22 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove OverridesHasInstance from TypeInfoFlags
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkGRefPtrGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/GRefPtrGtk.cpp (194369 => 194370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/GRefPtrGtk.cpp        2015-12-22 20:04:56 UTC (rev 194369)
+++ trunk/Source/WebCore/platform/gtk/GRefPtrGtk.cpp        2015-12-22 20:37:33 UTC (rev 194370)
</span><span class="lines">@@ -72,22 +72,6 @@
</span><span class="cx"> if (ptr)
</span><span class="cx"> gdk_cursor_unref(ptr);
</span><span class="cx"> }
</span><del>-
-#else
-
-template <> GtkWidgetPath* refGPtr(GtkWidgetPath* ptr)
-{
- if (ptr)
- gtk_widget_path_ref(ptr);
- return ptr;
-}
-
-template <> void derefGPtr(GtkWidgetPath* ptr)
-{
- if (ptr)
- gtk_widget_path_unref(ptr);
-}
-
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkGRefPtrGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/GRefPtrGtk.h (194369 => 194370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/GRefPtrGtk.h        2015-12-22 20:04:56 UTC (rev 194369)
+++ trunk/Source/WebCore/platform/gtk/GRefPtrGtk.h        2015-12-22 20:37:33 UTC (rev 194370)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/glib/GRefPtr.h>
</span><span class="cx">
</span><del>-typedef struct _GtkWidgetPath GtkWidgetPath;
</del><span class="cx"> typedef struct _SecretValue SecretValue;
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="lines">@@ -39,9 +38,6 @@
</span><span class="cx"> #ifdef GTK_API_VERSION_2
</span><span class="cx"> template <> GdkCursor* refGPtr(GdkCursor* ptr);
</span><span class="cx"> template <> void derefGPtr(GdkCursor* ptr);
</span><del>-#else
-template <> GtkWidgetPath* refGPtr(GtkWidgetPath* ptr);
-template <> void derefGPtr(GtkWidgetPath* ptr);
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkScrollbarThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp (194369 => 194370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp        2015-12-22 20:04:56 UTC (rev 194369)
+++ trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp        2015-12-22 20:37:33 UTC (rev 194370)
</span><span class="lines">@@ -163,12 +163,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifndef GTK_API_VERSION_2
</span><del>-
-#if !GTK_CHECK_VERSION(3, 19, 2)
-// Currently we use a static GtkStyleContext for GTK+ < 3.19, and a bunch of unique
-// GtkStyleContexts for GTK+ >= 3.19. This is crazy and definitely should not be necessary, but I
-// couldn't find any other way to not break one version or the other. Ideally one of the two
-// people on the planet who really understand GTK+ styles would fix this.
</del><span class="cx"> class ScrollbarStyleContext {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(ScrollbarStyleContext); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="lines">@@ -197,7 +191,6 @@
</span><span class="cx"> static NeverDestroyed<ScrollbarStyleContext> styleContext;
</span><span class="cx"> return styleContext.get().context();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> ScrollbarThemeGtk::ScrollbarThemeGtk()
</span><span class="cx"> {
</span><span class="lines">@@ -206,28 +199,14 @@
</span><span class="cx">
</span><span class="cx"> void ScrollbarThemeGtk::themeChanged()
</span><span class="cx"> {
</span><del>-#if !GTK_CHECK_VERSION(3, 19, 2)
</del><span class="cx"> gtk_style_context_invalidate(gtkScrollbarStyleContext());
</span><del>-#endif
</del><span class="cx"> updateThemeProperties();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollbarThemeGtk::updateThemeProperties()
</span><span class="cx"> {
</span><del>-#if GTK_CHECK_VERSION(3, 19, 2)
- GRefPtr<GtkStyleContext> styleContext = adoptGRef(gtk_style_context_new());
- GRefPtr<GtkWidgetPath> path = adoptGRef(gtk_widget_path_new());
-
- gtk_widget_path_append_type(path.get(), GTK_TYPE_SCROLLBAR);
- gtk_widget_path_iter_set_object_name(path.get(), 0, "scrollbar");
-
- gtk_style_context_set_path(styleContext.get(), path.get());
-#else
- GRefPtr<GtkStyleContext> styleContext = gtkScrollbarStyleContext();
-#endif
-
</del><span class="cx"> gtk_style_context_get_style(
</span><del>- styleContext.get(),
</del><ins>+ gtkScrollbarStyleContext(),
</ins><span class="cx"> "min-slider-length", &m_minThumbLength,
</span><span class="cx"> "slider-width", &m_thumbFatness,
</span><span class="cx"> "trough-border", &m_troughBorderWidth,
</span><span class="lines">@@ -293,19 +272,11 @@
</span><span class="cx"> return IntRect(trackRect.x() + (trackRect.width() - m_thumbFatness) / 2, trackRect.y() + thumbPos, m_thumbFatness, thumbLength(scrollbar));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-static const char* orientationStyleClass(ScrollbarOrientation orientation)
-{
- return orientation == VerticalScrollbar ? "vertical" : "horizontal";
-}
-
-#if !GTK_CHECK_VERSION(3, 19, 2)
</del><span class="cx"> static void applyScrollbarStyleContextClasses(GtkStyleContext* context, ScrollbarOrientation orientation)
</span><span class="cx"> {
</span><span class="cx"> gtk_style_context_add_class(context, GTK_STYLE_CLASS_SCROLLBAR);
</span><del>- gtk_style_context_add_class(context, orientationStyleClass(orientation));
</del><ins>+ gtk_style_context_add_class(context, orientation == VerticalScrollbar ? GTK_STYLE_CLASS_VERTICAL : GTK_STYLE_CLASS_HORIZONTAL);
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static void adjustRectAccordingToMargin(GtkStyleContext* context, GtkStateFlags state, IntRect& rect)
</span><span class="cx"> {
</span><span class="lines">@@ -325,129 +296,62 @@
</span><span class="cx"> if (m_troughUnderSteppers)
</span><span class="cx"> fullScrollbarRect = IntRect(scrollbar.x(), scrollbar.y(), scrollbar.width(), scrollbar.height());
</span><span class="cx">
</span><del>-#if GTK_CHECK_VERSION(3, 19, 2)
- GRefPtr<GtkStyleContext> styleContext = adoptGRef(gtk_style_context_new());
- GRefPtr<GtkWidgetPath> path = adoptGRef(gtk_widget_path_new());
</del><ins>+ GtkStyleContext* styleContext = gtkScrollbarStyleContext();
+ gtk_style_context_save(styleContext);
</ins><span class="cx">
</span><del>- gtk_widget_path_append_type(path.get(), GTK_TYPE_SCROLLBAR);
- gtk_widget_path_iter_set_object_name(path.get(), 0, "scrollbar");
- gtk_widget_path_iter_add_class(path.get(), 0, orientationStyleClass(scrollbar.orientation()));
</del><ins>+ applyScrollbarStyleContextClasses(styleContext, scrollbar.orientation());
+ gtk_style_context_add_class(styleContext, GTK_STYLE_CLASS_TROUGH);
</ins><span class="cx">
</span><del>- gtk_widget_path_append_type(path.get(), GTK_TYPE_SCROLLBAR);
- gtk_widget_path_iter_set_object_name(path.get(), 1, "trough");
</del><ins>+ adjustRectAccordingToMargin(styleContext, static_cast<GtkStateFlags>(0), fullScrollbarRect);
+ gtk_render_background(styleContext, context.platformContext()->cr(), fullScrollbarRect.x(), fullScrollbarRect.y(), fullScrollbarRect.width(), fullScrollbarRect.height());
+ gtk_render_frame(styleContext, context.platformContext()->cr(), fullScrollbarRect.x(), fullScrollbarRect.y(), fullScrollbarRect.width(), fullScrollbarRect.height());
</ins><span class="cx">
</span><del>- gtk_style_context_set_path(styleContext.get(), path.get());
-#else
- GRefPtr<GtkStyleContext> styleContext = gtkScrollbarStyleContext();
- gtk_style_context_save(styleContext.get());
-
- applyScrollbarStyleContextClasses(styleContext.get(), scrollbar.orientation());
- gtk_style_context_add_class(styleContext.get(), GTK_STYLE_CLASS_TROUGH);
-#endif
-
- adjustRectAccordingToMargin(styleContext.get(), static_cast<GtkStateFlags>(0), fullScrollbarRect);
- gtk_render_background(styleContext.get(), context.platformContext()->cr(), fullScrollbarRect.x(), fullScrollbarRect.y(), fullScrollbarRect.width(), fullScrollbarRect.height());
- gtk_render_frame(styleContext.get(), context.platformContext()->cr(), fullScrollbarRect.x(), fullScrollbarRect.y(), fullScrollbarRect.width(), fullScrollbarRect.height());
-
-#if !GTK_CHECK_VERSION(3, 19, 2)
- gtk_style_context_restore(styleContext.get());
-#endif
</del><ins>+ gtk_style_context_restore(styleContext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollbarThemeGtk::paintScrollbarBackground(GraphicsContext& context, Scrollbar& scrollbar)
</span><span class="cx"> {
</span><del>-#if GTK_CHECK_VERSION(3, 19, 2)
- GRefPtr<GtkStyleContext> styleContext = adoptGRef(gtk_style_context_new());
- GRefPtr<GtkWidgetPath> path = adoptGRef(gtk_widget_path_new());
</del><ins>+ GtkStyleContext* styleContext = gtkScrollbarStyleContext();
+ gtk_style_context_save(styleContext);
</ins><span class="cx">
</span><del>- gtk_widget_path_append_type(path.get(), GTK_TYPE_SCROLLBAR);
- gtk_widget_path_iter_set_object_name(path.get(), 0, "scrollbar");
- gtk_widget_path_iter_add_class(path.get(), 0, orientationStyleClass(scrollbar.orientation()));
</del><ins>+ applyScrollbarStyleContextClasses(styleContext, scrollbar.orientation());
+ gtk_style_context_add_class(styleContext, "scrolled-window");
+ gtk_render_frame(styleContext, context.platformContext()->cr(), scrollbar.x(), scrollbar.y(), scrollbar.width(), scrollbar.height());
</ins><span class="cx">
</span><del>- gtk_style_context_set_path(styleContext.get(), path.get());
-#else
- GRefPtr<GtkStyleContext> styleContext = gtkScrollbarStyleContext();
- gtk_style_context_save(styleContext.get());
-
- applyScrollbarStyleContextClasses(styleContext.get(), scrollbar.orientation());
- gtk_style_context_add_class(styleContext.get(), "scrolled-window");
-#endif
-
- 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.get());
-#endif
</del><ins>+ gtk_style_context_restore(styleContext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollbarThemeGtk::paintThumb(GraphicsContext& context, Scrollbar& scrollbar, const IntRect& rect)
</span><span class="cx"> {
</span><del>-#if GTK_CHECK_VERSION(3, 19, 2)
- GRefPtr<GtkStyleContext> styleContext = adoptGRef(gtk_style_context_new());
- GRefPtr<GtkWidgetPath> path = adoptGRef(gtk_widget_path_new());
</del><ins>+ GtkStyleContext* styleContext = gtkScrollbarStyleContext();
+ gtk_style_context_save(styleContext);
</ins><span class="cx">
</span><del>- gtk_widget_path_append_type(path.get(), GTK_TYPE_SCROLLBAR);
- gtk_widget_path_iter_set_object_name(path.get(), 0, "scrollbar");
- gtk_widget_path_iter_add_class(path.get(), 0, orientationStyleClass(scrollbar.orientation()));
-
- gtk_widget_path_append_type(path.get(), GTK_TYPE_SCROLLBAR);
- gtk_widget_path_iter_set_object_name(path.get(), 1, "trough");
-
- gtk_widget_path_append_type(path.get(), GTK_TYPE_SCROLLBAR);
- gtk_widget_path_iter_set_object_name(path.get(), 2, "slider");
-
- gtk_style_context_set_path(styleContext.get(), path.get());
-#else
- GRefPtr<GtkStyleContext> styleContext = gtkScrollbarStyleContext();
- gtk_style_context_save(styleContext.get());
-#endif
-
</del><span class="cx"> ScrollbarOrientation orientation = scrollbar.orientation();
</span><del>-#if !GTK_CHECK_VERSION(3, 19, 2)
- applyScrollbarStyleContextClasses(styleContext.get(), orientation);
- gtk_style_context_add_class(styleContext.get(), GTK_STYLE_CLASS_SLIDER);
-#endif
</del><ins>+ applyScrollbarStyleContextClasses(styleContext, orientation);
+ gtk_style_context_add_class(styleContext, GTK_STYLE_CLASS_SLIDER);
</ins><span class="cx">
</span><span class="cx"> guint flags = 0;
</span><span class="cx"> if (scrollbar.pressedPart() == ThumbPart)
</span><span class="cx"> flags |= GTK_STATE_FLAG_ACTIVE;
</span><span class="cx"> if (scrollbar.hoveredPart() == ThumbPart)
</span><span class="cx"> flags |= GTK_STATE_FLAG_PRELIGHT;
</span><del>- gtk_style_context_set_state(styleContext.get(), static_cast<GtkStateFlags>(flags));
</del><ins>+ gtk_style_context_set_state(styleContext, static_cast<GtkStateFlags>(flags));
</ins><span class="cx">
</span><span class="cx"> IntRect thumbRect(rect);
</span><del>- adjustRectAccordingToMargin(styleContext.get(), static_cast<GtkStateFlags>(flags), thumbRect);
- gtk_render_slider(styleContext.get(), context.platformContext()->cr(), thumbRect.x(), thumbRect.y(), thumbRect.width(), thumbRect.height(),
</del><ins>+ adjustRectAccordingToMargin(styleContext, static_cast<GtkStateFlags>(flags), thumbRect);
+ gtk_render_slider(styleContext, context.platformContext()->cr(), thumbRect.x(), thumbRect.y(), thumbRect.width(), thumbRect.height(),
</ins><span class="cx"> orientation == VerticalScrollbar ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL);
</span><span class="cx">
</span><del>-#if !GTK_CHECK_VERSION(3, 19, 2)
- gtk_style_context_restore(styleContext.get());
-#endif
</del><ins>+ gtk_style_context_restore(styleContext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollbarThemeGtk::paintButton(GraphicsContext& context, Scrollbar& scrollbar, const IntRect& rect, ScrollbarPart part)
</span><span class="cx"> {
</span><del>-#if GTK_CHECK_VERSION(3, 19, 2)
- GRefPtr<GtkStyleContext> styleContext = adoptGRef(gtk_style_context_new());
- GRefPtr<GtkWidgetPath> path = adoptGRef(gtk_widget_path_new());
</del><ins>+ GtkStyleContext* styleContext = gtkScrollbarStyleContext();
+ gtk_style_context_save(styleContext);
</ins><span class="cx">
</span><del>- gtk_widget_path_append_type(path.get(), GTK_TYPE_SCROLLBAR);
- gtk_widget_path_iter_set_object_name(path.get(), 0, "scrollbar");
- gtk_widget_path_iter_add_class(path.get(), 0, orientationStyleClass(scrollbar.orientation()));
-
- gtk_widget_path_append_type(path.get(), GTK_TYPE_SCROLLBAR);
- gtk_widget_path_iter_set_object_name(path.get(), 1, "button");
-
- gtk_style_context_set_path(styleContext.get(), path.get());
-#else
- GRefPtr<GtkStyleContext> styleContext = gtkScrollbarStyleContext();
- gtk_style_context_save(styleContext.get());
-#endif
-
</del><span class="cx"> ScrollbarOrientation orientation = scrollbar.orientation();
</span><del>-#if !GTK_CHECK_VERSION(3, 19, 2)
- applyScrollbarStyleContextClasses(styleContext.get(), orientation);
-#endif
</del><ins>+ applyScrollbarStyleContextClasses(styleContext, orientation);
</ins><span class="cx">
</span><span class="cx"> guint flags = 0;
</span><span class="cx"> if ((BackButtonStartPart == part && scrollbar.currentPos())
</span><span class="lines">@@ -460,17 +364,14 @@
</span><span class="cx"> flags |= GTK_STATE_FLAG_PRELIGHT;
</span><span class="cx"> } else
</span><span class="cx"> flags |= GTK_STATE_FLAG_INSENSITIVE;
</span><del>- gtk_style_context_set_state(styleContext.get(), static_cast<GtkStateFlags>(flags));
</del><ins>+ gtk_style_context_set_state(styleContext, static_cast<GtkStateFlags>(flags));
</ins><span class="cx">
</span><del>-#if !GTK_CHECK_VERSION(3, 19, 2)
- gtk_style_context_add_class(styleContext.get(), GTK_STYLE_CLASS_BUTTON);
-#endif
</del><ins>+ gtk_style_context_add_class(styleContext, GTK_STYLE_CLASS_BUTTON);
+ gtk_render_background(styleContext, context.platformContext()->cr(), rect.x(), rect.y(), rect.width(), rect.height());
+ gtk_render_frame(styleContext, context.platformContext()->cr(), rect.x(), rect.y(), rect.width(), rect.height());
</ins><span class="cx">
</span><del>- gtk_render_background(styleContext.get(), context.platformContext()->cr(), rect.x(), rect.y(), rect.width(), rect.height());
- gtk_render_frame(styleContext.get(), context.platformContext()->cr(), rect.x(), rect.y(), rect.width(), rect.height());
-
</del><span class="cx"> gfloat arrowScaling;
</span><del>- gtk_style_context_get_style(styleContext.get(), "arrow-scaling", &arrowScaling, nullptr);
</del><ins>+ gtk_style_context_get_style(styleContext, "arrow-scaling", &arrowScaling, nullptr);
</ins><span class="cx">
</span><span class="cx"> double arrowSize = std::min(rect.width(), rect.height()) * arrowScaling;
</span><span class="cx"> FloatPoint arrowPoint(
</span><span class="lines">@@ -479,7 +380,7 @@
</span><span class="cx">
</span><span class="cx"> if (flags & GTK_STATE_FLAG_ACTIVE) {
</span><span class="cx"> gint arrowDisplacementX, arrowDisplacementY;
</span><del>- gtk_style_context_get_style(styleContext.get(), "arrow-displacement-x", &arrowDisplacementX, "arrow-displacement-y", &arrowDisplacementY, nullptr);
</del><ins>+ gtk_style_context_get_style(styleContext, "arrow-displacement-x", &arrowDisplacementX, "arrow-displacement-y", &arrowDisplacementY, nullptr);
</ins><span class="cx"> arrowPoint.move(arrowDisplacementX, arrowDisplacementY);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -489,11 +390,9 @@
</span><span class="cx"> else
</span><span class="cx"> angle = (part == ForwardButtonEndPart || part == ForwardButtonStartPart) ? G_PI / 2 : 3 * (G_PI / 2);
</span><span class="cx">
</span><del>- gtk_render_arrow(styleContext.get(), context.platformContext()->cr(), angle, arrowPoint.x(), arrowPoint.y(), arrowSize);
</del><ins>+ gtk_render_arrow(styleContext, context.platformContext()->cr(), angle, arrowPoint.x(), arrowPoint.y(), arrowSize);
</ins><span class="cx">
</span><del>-#if !GTK_CHECK_VERSION(3, 19, 2)
- gtk_style_context_restore(styleContext.get());
-#endif
</del><ins>+ gtk_style_context_restore(styleContext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ScrollbarThemeGtk::paint(Scrollbar& scrollbar, GraphicsContext& graphicsContext, const IntRect& damageRect)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.cpp (194369 => 194370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeGtk.cpp        2015-12-22 20:04:56 UTC (rev 194369)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.cpp        2015-12-22 20:37:33 UTC (rev 194370)
</span><span class="lines">@@ -152,62 +152,34 @@
</span><span class="cx"> initialized = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GRefPtr<GtkWidgetPath> path = adoptGRef(gtk_widget_path_new());
- gtk_widget_path_append_type(path.get(), widgetType);
</del><ins>+ GtkWidgetPath* path = gtk_widget_path_new();
+ gtk_widget_path_append_type(path, widgetType);
</ins><span class="cx">
</span><del>-#if GTK_CHECK_VERSION(3, 19, 2)
- // Pick a good default object path for the style context based on the widget type. This will
- // usually need to be overridden manually, but it doesn't hurt to have a good default.
</del><span class="cx"> if (widgetType == GTK_TYPE_ENTRY)
</span><del>- gtk_widget_path_iter_set_object_name(path.get(), 0, "entry");
</del><ins>+ gtk_widget_path_iter_add_class(path, 0, GTK_STYLE_CLASS_ENTRY);
</ins><span class="cx"> else if (widgetType == GTK_TYPE_ARROW)
</span><del>- gtk_widget_path_iter_set_object_name(path.get(), 0, "button"); // Note: not a typo.
</del><ins>+ gtk_widget_path_iter_add_class(path, 0, "arrow");
</ins><span class="cx"> else if (widgetType == GTK_TYPE_BUTTON) {
</span><del>- gtk_widget_path_iter_set_object_name(path.get(), 0, "button");
- gtk_widget_path_iter_add_class(path.get(), 0, "text-button");
</del><ins>+ gtk_widget_path_iter_add_class(path, 0, GTK_STYLE_CLASS_BUTTON);
+ gtk_widget_path_iter_add_class(path, 0, "text-button");
</ins><span class="cx"> } else if (widgetType == GTK_TYPE_SCALE)
</span><del>- gtk_widget_path_iter_set_object_name(path.get(), 0, "scale");
</del><ins>+ gtk_widget_path_iter_add_class(path, 0, GTK_STYLE_CLASS_SCALE);
</ins><span class="cx"> else if (widgetType == GTK_TYPE_SEPARATOR)
</span><del>- gtk_widget_path_iter_set_object_name(path.get(), 0, "separator");
</del><ins>+ gtk_widget_path_iter_add_class(path, 0, GTK_STYLE_CLASS_SEPARATOR);
</ins><span class="cx"> else if (widgetType == GTK_TYPE_PROGRESS_BAR)
</span><del>- gtk_widget_path_iter_set_object_name(path.get(), 0, "progressbar");
</del><ins>+ gtk_widget_path_iter_add_class(path, 0, GTK_STYLE_CLASS_PROGRESSBAR);
</ins><span class="cx"> else if (widgetType == GTK_TYPE_SPIN_BUTTON)
</span><del>- gtk_widget_path_iter_set_object_name(path.get(), 0, "spinbutton");
- else if (widgetType == GTK_TYPE_TREE_VIEW) {
- gtk_widget_path_iter_set_object_name(path.get(), 0, "treeview");
- gtk_widget_path_iter_add_class(path.get(), 0, "view");
- } else if (widgetType == GTK_TYPE_CHECK_BUTTON)
- gtk_widget_path_iter_set_object_name(path.get(), 0, "checkbutton");
- else if (widgetType == GTK_TYPE_RADIO_BUTTON)
- gtk_widget_path_iter_set_object_name(path.get(), 0, "radiobutton");
- else if (widgetType == GTK_TYPE_COMBO_BOX)
- gtk_widget_path_iter_set_object_name(path.get(), 0, "combobox");
-#else
- if (widgetType == GTK_TYPE_ENTRY)
- gtk_widget_path_iter_add_class(path.get(), 0, GTK_STYLE_CLASS_ENTRY);
- else if (widgetType == GTK_TYPE_ARROW)
- gtk_widget_path_iter_add_class(path.get(), 0, "arrow");
- else if (widgetType == GTK_TYPE_BUTTON) {
- gtk_widget_path_iter_add_class(path.get(), 0, GTK_STYLE_CLASS_BUTTON);
- gtk_widget_path_iter_add_class(path.get(), 0, "text-button");
- } else if (widgetType == GTK_TYPE_SCALE)
- gtk_widget_path_iter_add_class(path.get(), 0, GTK_STYLE_CLASS_SCALE);
- else if (widgetType == GTK_TYPE_SEPARATOR)
- gtk_widget_path_iter_add_class(path.get(), 0, GTK_STYLE_CLASS_SEPARATOR);
- else if (widgetType == GTK_TYPE_PROGRESS_BAR)
- gtk_widget_path_iter_add_class(path.get(), 0, GTK_STYLE_CLASS_PROGRESSBAR);
- else if (widgetType == GTK_TYPE_SPIN_BUTTON)
- gtk_widget_path_iter_add_class(path.get(), 0, GTK_STYLE_CLASS_SPINBUTTON);
</del><ins>+ gtk_widget_path_iter_add_class(path, 0, GTK_STYLE_CLASS_SPINBUTTON);
</ins><span class="cx"> else if (widgetType == GTK_TYPE_TREE_VIEW)
</span><del>- gtk_widget_path_iter_add_class(path.get(), 0, GTK_STYLE_CLASS_VIEW);
</del><ins>+ gtk_widget_path_iter_add_class(path, 0, GTK_STYLE_CLASS_VIEW);
</ins><span class="cx"> else if (widgetType == GTK_TYPE_CHECK_BUTTON)
</span><del>- gtk_widget_path_iter_add_class(path.get(), 0, GTK_STYLE_CLASS_CHECK);
</del><ins>+ gtk_widget_path_iter_add_class(path, 0, GTK_STYLE_CLASS_CHECK);
</ins><span class="cx"> else if (widgetType == GTK_TYPE_RADIO_BUTTON)
</span><del>- gtk_widget_path_iter_add_class(path.get(), 0, GTK_STYLE_CLASS_RADIO);
-#endif
</del><ins>+ gtk_widget_path_iter_add_class(path, 0, GTK_STYLE_CLASS_RADIO);
</ins><span class="cx">
</span><span class="cx"> GRefPtr<GtkStyleContext> context = adoptGRef(gtk_style_context_new());
</span><del>- gtk_style_context_set_path(context.get(), path.get());
</del><ins>+ gtk_style_context_set_path(context.get(), path);
+ gtk_widget_path_free(path);
</ins><span class="cx">
</span><span class="cx"> return context;
</span><span class="cx"> }
</span><span class="lines">@@ -480,7 +452,9 @@
</span><span class="cx"> if (!style.width().isIntrinsicOrAuto() && !style.height().isAuto())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // Other ports hard-code this to 13. GTK+ users tend to demand the native look.
</del><ins>+ // Other ports hard-code this to 13 which is also the default value defined by GTK+.
+ // GTK+ users tend to demand the native look.
+ // It could be made a configuration option values other than 13 actually break site compatibility.
</ins><span class="cx"> gint indicatorSize;
</span><span class="cx"> gtk_style_context_get_style(context.get(), "indicator-size", &indicatorSize, nullptr);
</span><span class="cx">
</span><span class="lines">@@ -494,38 +468,7 @@
</span><span class="cx"> static void paintToggle(const RenderThemeGtk* theme, GType widgetType, const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& fullRect)
</span><span class="cx"> {
</span><span class="cx"> GRefPtr<GtkStyleContext> context = createStyleContext(widgetType);
</span><del>-#if GTK_CHECK_VERSION(3, 19, 2)
- GRefPtr<GtkWidgetPath> path = adoptGRef(gtk_widget_path_new());
</del><span class="cx">
</span><del>- if (widgetType == GTK_TYPE_CHECK_BUTTON) {
- if (theme->isChecked(renderObject) || theme->isIndeterminate(renderObject)) {
- gtk_widget_path_append_type(path.get(), GTK_TYPE_CHECK_BUTTON);
- gtk_widget_path_iter_set_object_name(path.get(), 0, "checkbutton");
- } else {
- gtk_widget_path_append_type(path.get(), GTK_TYPE_CHECK_BUTTON);
- gtk_widget_path_iter_set_object_name(path.get(), 0, "button");
- gtk_widget_path_iter_add_class(path.get(), 0, "check");
- }
-
- gtk_widget_path_append_type(path.get(), GTK_TYPE_CHECK_BUTTON);
- gtk_widget_path_iter_set_object_name(path.get(), 1, "check");
- } else if (widgetType == GTK_TYPE_RADIO_BUTTON) {
- if (theme->isChecked(renderObject) || theme->isIndeterminate(renderObject)) {
- gtk_widget_path_append_type(path.get(), GTK_TYPE_RADIO_BUTTON);
- gtk_widget_path_iter_set_object_name(path.get(), 0, "radiobutton");
- } else {
- gtk_widget_path_append_type(path.get(), GTK_TYPE_RADIO_BUTTON);
- gtk_widget_path_iter_set_object_name(path.get(), 0, "button");
- gtk_widget_path_iter_add_class(path.get(), 0, "radio");
- }
-
- gtk_widget_path_append_type(path.get(), GTK_TYPE_RADIO_BUTTON);
- gtk_widget_path_iter_set_object_name(path.get(), 1, "radio");
- }
-
- gtk_style_context_set_path(context.get(), path.get());
-#endif
-
</del><span class="cx"> // Some themes do not render large toggle buttons properly, so we simply
</span><span class="cx"> // shrink the rectangle back down to the default size and then center it
</span><span class="cx"> // in the full toggle button region. The reason for not simply forcing toggle
</span><span class="lines">@@ -544,12 +487,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gtk_style_context_set_direction(context.get(), static_cast<GtkTextDirection>(gtkTextDirection(renderObject.style().direction())));
</span><del>-
-#if GTK_CHECK_VERSION(3, 19, 2)
- gtk_style_context_add_class(context.get(), "toggle");
-#else
</del><span class="cx"> gtk_style_context_add_class(context.get(), widgetType == GTK_TYPE_CHECK_BUTTON ? GTK_STYLE_CLASS_CHECK : GTK_STYLE_CLASS_RADIO);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> guint flags = 0;
</span><span class="cx"> if (!theme->isEnabled(renderObject))
</span><span class="lines">@@ -676,9 +614,7 @@
</span><span class="cx"> GRefPtr<GtkStyleContext> context = createStyleContext(GTK_TYPE_BUTTON);
</span><span class="cx">
</span><span class="cx"> gtk_style_context_set_direction(context.get(), static_cast<GtkTextDirection>(gtkTextDirection(renderObject.style().direction())));
</span><del>-#if !GTK_CHECK_VERSION(3, 19, 2)
</del><span class="cx"> gtk_style_context_add_class(context.get(), GTK_STYLE_CLASS_BUTTON);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> renderButton(this, context.get(), renderObject, paintInfo, rect);
</span><span class="cx">
</span><span class="lines">@@ -707,20 +643,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> GRefPtr<GtkStyleContext> context = createStyleContext(GTK_TYPE_COMBO_BOX);
</span><del>-#if GTK_CHECK_VERSION(3, 19, 2)
- GRefPtr<GtkWidgetPath> path = adoptGRef(gtk_widget_path_new());
</del><span class="cx">
</span><del>- gtk_widget_path_append_type(path.get(), GTK_TYPE_COMBO_BOX);
- gtk_widget_path_iter_set_object_name(path.get(), 0, "combobox");
-
- gtk_widget_path_append_type(path.get(), GTK_TYPE_COMBO_BOX);
- gtk_widget_path_iter_set_object_name(path.get(), 1, "button");
- gtk_widget_path_iter_add_class(path.get(), 1, "combo");
-
- gtk_style_context_set_path(context.get(), path.get());
-#else
</del><span class="cx"> gtk_style_context_add_class(context.get(), GTK_STYLE_CLASS_BUTTON);
</span><del>-#endif
</del><span class="cx"> gtk_style_context_set_direction(context.get(), static_cast<GtkTextDirection>(gtkTextDirection(style.direction())));
</span><span class="cx">
</span><span class="cx"> gtk_style_context_set_state(context.get(), static_cast<GtkStateFlags>(0));
</span><span class="lines">@@ -735,9 +659,7 @@
</span><span class="cx">
</span><span class="cx"> GtkTextDirection direction = static_cast<GtkTextDirection>(gtkTextDirection(style.direction()));
</span><span class="cx"> gtk_style_context_set_direction(context.get(), direction);
</span><del>-#if !GTK_CHECK_VERSION(3, 19, 2)
</del><span class="cx"> gtk_style_context_add_class(context.get(), "separator");
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> gboolean wideSeparators;
</span><span class="cx"> gint separatorWidth;
</span><span class="lines">@@ -799,9 +721,7 @@
</span><span class="cx"> // Paint the button.
</span><span class="cx"> GRefPtr<GtkStyleContext> buttonStyleContext = createStyleContext(GTK_TYPE_BUTTON);
</span><span class="cx"> gtk_style_context_set_direction(buttonStyleContext.get(), direction);
</span><del>-#if !GTK_CHECK_VERSION(3, 19, 2)
</del><span class="cx"> gtk_style_context_add_class(buttonStyleContext.get(), GTK_STYLE_CLASS_BUTTON);
</span><del>-#endif
</del><span class="cx"> renderButton(this, buttonStyleContext.get(), renderObject, paintInfo, rect);
</span><span class="cx">
</span><span class="cx"> // Get the inner rectangle.
</span><span class="lines">@@ -838,10 +758,8 @@
</span><span class="cx"> GRefPtr<GtkStyleContext> arrowStyleContext = createStyleContext(GTK_TYPE_ARROW);
</span><span class="cx">
</span><span class="cx"> gtk_style_context_set_direction(arrowStyleContext.get(), direction);
</span><del>-#if !GTK_CHECK_VERSION(3, 19, 2)
</del><span class="cx"> gtk_style_context_add_class(arrowStyleContext.get(), "arrow");
</span><span class="cx"> gtk_style_context_add_class(arrowStyleContext.get(), GTK_STYLE_CLASS_BUTTON);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> gfloat arrowScaling;
</span><span class="cx"> gtk_style_context_get_style(arrowStyleContext.get(), "arrow-scaling", &arrowScaling, nullptr);
</span><span class="lines">@@ -861,19 +779,10 @@
</span><span class="cx">
</span><span class="cx"> // Paint the separator if needed.
</span><span class="cx"> GRefPtr<GtkStyleContext> separatorStyleContext = createStyleContext(GTK_TYPE_COMBO_BOX);
</span><del>-#if GTK_CHECK_VERSION(3, 19, 2)
- GRefPtr<GtkWidgetPath> path = adoptGRef(gtk_widget_path_new());
</del><span class="cx">
</span><del>- gtk_widget_path_append_type(path.get(), GTK_TYPE_SEPARATOR);
- gtk_widget_path_iter_set_object_name(path.get(), 0, "separator");
-
- gtk_style_context_set_path(separatorStyleContext.get(), path.get());
-#else
</del><ins>+ gtk_style_context_set_direction(separatorStyleContext.get(), direction);
</ins><span class="cx"> gtk_style_context_add_class(separatorStyleContext.get(), "separator");
</span><del>-#endif
</del><span class="cx">
</span><del>- gtk_style_context_set_direction(separatorStyleContext.get(), direction);
-
</del><span class="cx"> gboolean wideSeparators;
</span><span class="cx"> gint separatorWidth;
</span><span class="cx"> gtk_style_context_get_style(separatorStyleContext.get(), "wide-separators", &wideSeparators, "separator-width", &separatorWidth, nullptr);
</span><span class="lines">@@ -922,9 +831,7 @@
</span><span class="cx"> GRefPtr<GtkStyleContext> context = createStyleContext(GTK_TYPE_ENTRY);
</span><span class="cx">
</span><span class="cx"> gtk_style_context_set_direction(context.get(), static_cast<GtkTextDirection>(gtkTextDirection(renderObject.style().direction())));
</span><del>-#if !GTK_CHECK_VERSION(3, 19, 2)
</del><span class="cx"> gtk_style_context_add_class(context.get(), GTK_STYLE_CLASS_ENTRY);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> guint flags = 0;
</span><span class="cx"> if (!isEnabled(renderObject) || isReadOnlyControl(renderObject))
</span><span class="lines">@@ -1134,9 +1041,7 @@
</span><span class="cx">
</span><span class="cx"> static void applySliderStyleContextClasses(GtkStyleContext* context, ControlPart part)
</span><span class="cx"> {
</span><del>-#if !GTK_CHECK_VERSION(3, 19, 2)
</del><span class="cx"> gtk_style_context_add_class(context, GTK_STYLE_CLASS_SCALE);
</span><del>-#endif
</del><span class="cx"> if (part == SliderHorizontalPart || part == SliderThumbHorizontalPart)
</span><span class="cx"> gtk_style_context_add_class(context, GTK_STYLE_CLASS_HORIZONTAL);
</span><span class="cx"> else if (part == SliderVerticalPart || part == SliderThumbVerticalPart)
</span><span class="lines">@@ -1149,23 +1054,10 @@
</span><span class="cx"> ASSERT_UNUSED(part, part == SliderHorizontalPart || part == SliderVerticalPart || part == MediaVolumeSliderPart);
</span><span class="cx">
</span><span class="cx"> GRefPtr<GtkStyleContext> context = createStyleContext(GTK_TYPE_SCALE);
</span><del>-#if GTK_CHECK_VERSION(3, 19, 2)
- GRefPtr<GtkWidgetPath> path = adoptGRef(gtk_widget_path_new());
</del><span class="cx">
</span><del>- gtk_widget_path_append_type(path.get(), GTK_TYPE_SCALE);
- gtk_widget_path_iter_set_object_name(path.get(), 0, "scale");
-
- gtk_widget_path_append_type(path.get(), GTK_TYPE_SCALE);
- gtk_widget_path_iter_set_object_name(path.get(), 1, "trough");
-
- gtk_style_context_set_path(context.get(), path.get());
-#endif
-
</del><span class="cx"> gtk_style_context_set_direction(context.get(), gtkTextDirection(renderObject.style().direction()));
</span><span class="cx"> applySliderStyleContextClasses(context.get(), part);
</span><del>-#if !GTK_CHECK_VERSION(3, 19, 2)
</del><span class="cx"> gtk_style_context_add_class(context.get(), GTK_STYLE_CLASS_TROUGH);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (!isEnabled(renderObject))
</span><span class="cx"> gtk_style_context_set_state(context.get(), GTK_STATE_FLAG_INSENSITIVE);
</span><span class="lines">@@ -1190,24 +1082,10 @@
</span><span class="cx"> ASSERT(part == SliderThumbHorizontalPart || part == SliderThumbVerticalPart || part == MediaVolumeSliderThumbPart);
</span><span class="cx">
</span><span class="cx"> GRefPtr<GtkStyleContext> context = createStyleContext(GTK_TYPE_SCALE);
</span><del>-#if GTK_CHECK_VERSION(3, 19, 2)
- // FIXME: The entire slider is too wide, stretching the thumb into an oval rather than a circle.
- GRefPtr<GtkWidgetPath> path = adoptGRef(gtk_widget_path_new());
</del><span class="cx">
</span><del>- gtk_widget_path_append_type(path.get(), GTK_TYPE_SCALE);
- gtk_widget_path_iter_set_object_name(path.get(), 0, "scale");
-
- gtk_widget_path_append_type(path.get(), GTK_TYPE_SCALE);
- gtk_widget_path_iter_set_object_name(path.get(), 1, "trough");
-
- gtk_widget_path_append_type(path.get(), GTK_TYPE_SCALE);
- gtk_widget_path_iter_set_object_name(path.get(), 2, "slider");
-
- gtk_style_context_set_path(context.get(), path.get());
-#endif
-
</del><span class="cx"> gtk_style_context_set_direction(context.get(), gtkTextDirection(renderObject.style().direction()));
</span><span class="cx"> applySliderStyleContextClasses(context.get(), part);
</span><ins>+ gtk_style_context_add_class(context.get(), GTK_STYLE_CLASS_SLIDER);
</ins><span class="cx">
</span><span class="cx"> guint flags = 0;
</span><span class="cx"> if (!isEnabled(renderObject))
</span><span class="lines">@@ -1249,42 +1127,16 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> GRefPtr<GtkStyleContext> context = createStyleContext(GTK_TYPE_PROGRESS_BAR);
</span><del>-#if GTK_CHECK_VERSION(3, 19, 2)
- GRefPtr<GtkWidgetPath> path = adoptGRef(gtk_widget_path_new());
-
- gtk_widget_path_append_type(path.get(), GTK_TYPE_PROGRESS_BAR);
- gtk_widget_path_iter_set_object_name(path.get(), 0, "progressbar");
-
- gtk_widget_path_append_type(path.get(), GTK_TYPE_PROGRESS_BAR);
- gtk_widget_path_iter_set_object_name(path.get(), 1, "trough");
-
- gtk_style_context_set_path(context.get(), path.get());
-#else
</del><span class="cx"> gtk_style_context_save(context.get());
</span><ins>+
</ins><span class="cx"> gtk_style_context_add_class(context.get(), GTK_STYLE_CLASS_TROUGH);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> gtk_render_background(context.get(), paintInfo.context().platformContext()->cr(), rect.x(), rect.y(), rect.width(), rect.height());
</span><span class="cx"> gtk_render_frame(context.get(), paintInfo.context().platformContext()->cr(), rect.x(), rect.y(), rect.width(), rect.height());
</span><span class="cx">
</span><del>-#if GTK_CHECK_VERSION(3, 19, 2)
- path = adoptGRef(gtk_widget_path_new());
-
- gtk_widget_path_append_type(path.get(), GTK_TYPE_PROGRESS_BAR);
- gtk_widget_path_iter_set_object_name(path.get(), 0, "progressbar");
-
- gtk_widget_path_append_type(path.get(), GTK_TYPE_PROGRESS_BAR);
- gtk_widget_path_iter_set_object_name(path.get(), 1, "trough");
-
- gtk_widget_path_append_type(path.get(), GTK_TYPE_PROGRESS_BAR);
- gtk_widget_path_iter_set_object_name(path.get(), 2, "progress");
-
- gtk_style_context_set_path(context.get(), path.get());
-#else
</del><span class="cx"> gtk_style_context_restore(context.get());
</span><del>- gtk_style_context_add_class(context.get(), GTK_STYLE_CLASS_PROGRESSBAR);
-#endif
</del><span class="cx">
</span><ins>+ gtk_style_context_add_class(context.get(), GTK_STYLE_CLASS_PROGRESSBAR);
</ins><span class="cx"> gtk_style_context_set_state(context.get(), static_cast<GtkStateFlags>(0));
</span><span class="cx">
</span><span class="cx"> GtkBorder padding;
</span><span class="lines">@@ -1336,21 +1188,7 @@
</span><span class="cx"> ASSERT(arrowType == GTK_ARROW_UP || arrowType == GTK_ARROW_DOWN);
</span><span class="cx">
</span><span class="cx"> gtk_style_context_save(context);
</span><del>-
-#if GTK_CHECK_VERSION(3, 19, 2)
- GRefPtr<GtkWidgetPath> path = adoptGRef(gtk_widget_path_new());
-
- gtk_widget_path_append_type(path.get(), GTK_TYPE_SPIN_BUTTON);
- gtk_widget_path_iter_set_object_name(path.get(), 0, "spinbutton");
-
- gtk_widget_path_append_type(path.get(), GTK_TYPE_SPIN_BUTTON);
- gtk_widget_path_iter_set_object_name(path.get(), 1, "button");
- gtk_widget_path_iter_add_class(path.get(), 1, arrowType == GTK_ARROW_UP ? "up" : "down");
-
- gtk_style_context_set_path(context, path.get());
-#else
</del><span class="cx"> gtk_style_context_add_class(context, GTK_STYLE_CLASS_BUTTON);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> GtkTextDirection direction = gtk_style_context_get_direction(context);
</span><span class="cx"> guint state = static_cast<guint>(gtk_style_context_get_state(context));
</span><span class="lines">@@ -1451,28 +1289,16 @@
</span><span class="cx">
</span><span class="cx"> static Color styleColor(GType widgetType, GtkStateFlags state, StyleColorType colorType)
</span><span class="cx"> {
</span><del>- GRefPtr<GtkStyleContext> context = createStyleContext(widgetType);
-#if GTK_CHECK_VERSION(3, 19, 2)
- if (widgetType == GTK_TYPE_ENTRY) {
- GRefPtr<GtkWidgetPath> path = adoptGRef(gtk_widget_path_new());
</del><span class="cx">
</span><del>- gtk_widget_path_append_type(path.get(), GTK_TYPE_ENTRY);
- gtk_widget_path_iter_set_object_name(path.get(), 0, "entry");
-
- gtk_widget_path_append_type(path.get(), GTK_TYPE_ENTRY);
- gtk_widget_path_iter_set_object_name(path.get(), 1, "selection");
-
- gtk_style_context_set_path(context.get(), path.get());
- }
-#endif
-
</del><ins>+ GRefPtr<GtkStyleContext> context = createStyleContext(widgetType);
+ // Recent GTK+ versions (> 3.14) require to explicitly set the state before getting the color.
</ins><span class="cx"> gtk_style_context_set_state(context.get(), state);
</span><span class="cx">
</span><span class="cx"> GdkRGBA gdkRGBAColor;
</span><span class="cx"> if (colorType == StyleColorBackground)
</span><del>- gtk_style_context_get_background_color(context.get(), state, &gdkRGBAColor);
</del><ins>+ gtk_style_context_get_background_color(context.get(), gtk_style_context_get_state(context.get()), &gdkRGBAColor);
</ins><span class="cx"> else
</span><del>- gtk_style_context_get_color(context.get(), state, &gdkRGBAColor);
</del><ins>+ gtk_style_context_get_color(context.get(), gtk_style_context_get_state(context.get()), &gdkRGBAColor);
</ins><span class="cx"> return gdkRGBAColor;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>