<!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>[197248] releases/WebKitGTK/webkit-2.4/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/197248">197248</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-27 07:08:43 -0800 (Sat, 27 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192723">r192723</a> - [GTK] Warning spam from GtkStyleContext
https://bugs.webkit.org/show_bug.cgi?id=151520
Reviewed by Carlos Garcia Campos.
Audit every use of gtk_style_context_get_* to fix compatibility with GTK+ 3.19. Some of
these were already fine and are only changed for clarity.
Company: gtk_style_context_get() (and _get_padding/border/color()) should only ever be
called with the same state as gtk_style_context_get_state()
Company: usually that's a simple replacing of the old state (like in the trace you posted)
Company: sometimes it requires calling gtk_style_context_set_sate() with the right state
first
Company: and in very rare cases it needs a gtk_style_context_save() before the set_state(),
too
* platform/gtk/ScrollbarThemeGtk.cpp:
(WebCore::adjustRectAccordingToMargin):
* rendering/RenderThemeGtk.cpp:
(gtk_css_section_print):
(WebCore::getStyleContext):
(WebCore::RenderThemeGtk::initMediaColors):
(WebCore::renderButton):
(WebCore::getComboBoxMetrics):
(WebCore::RenderThemeGtk::paintMenuList):
(WebCore::RenderThemeGtk::paintTextField):
(WebCore::RenderThemeGtk::paintProgressBar):
(WebCore::spinButtonArrowSize):
(WebCore::RenderThemeGtk::adjustInnerSpinButtonStyle):
(WebCore::styleColor):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgtkRenderThemeGtk3cpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgtkScrollbarThemeGtk3cpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/ScrollbarThemeGtk3.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (197247 => 197248)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2016-02-27 15:02:59 UTC (rev 197247)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2016-02-27 15:08:43 UTC (rev 197248)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2015-11-21 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [GTK] Warning spam from GtkStyleContext
+ https://bugs.webkit.org/show_bug.cgi?id=151520
+
+ Reviewed by Carlos Garcia Campos.
+
+ Audit every use of gtk_style_context_get_* to fix compatibility with GTK+ 3.19. Some of
+ these were already fine and are only changed for clarity.
+
+ Company: gtk_style_context_get() (and _get_padding/border/color()) should only ever be
+ called with the same state as gtk_style_context_get_state()
+ Company: usually that's a simple replacing of the old state (like in the trace you posted)
+ Company: sometimes it requires calling gtk_style_context_set_sate() with the right state
+ first
+ Company: and in very rare cases it needs a gtk_style_context_save() before the set_state(),
+ too
+
+ * platform/gtk/ScrollbarThemeGtk.cpp:
+ (WebCore::adjustRectAccordingToMargin):
+ * rendering/RenderThemeGtk.cpp:
+ (gtk_css_section_print):
+ (WebCore::getStyleContext):
+ (WebCore::RenderThemeGtk::initMediaColors):
+ (WebCore::renderButton):
+ (WebCore::getComboBoxMetrics):
+ (WebCore::RenderThemeGtk::paintMenuList):
+ (WebCore::RenderThemeGtk::paintTextField):
+ (WebCore::RenderThemeGtk::paintProgressBar):
+ (WebCore::spinButtonArrowSize):
+ (WebCore::RenderThemeGtk::adjustInnerSpinButtonStyle):
+ (WebCore::styleColor):
+
</ins><span class="cx"> 2015-10-07 ChangSeok Oh <changseok.oh@collabora.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Progress bar is broken on recent GTK+
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgtkRenderThemeGtk3cpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp (197247 => 197248)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp 2016-02-27 15:02:59 UTC (rev 197247)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp 2016-02-27 15:08:43 UTC (rev 197248)
</span><span class="lines">@@ -139,12 +139,19 @@
</span><span class="cx"> GdkRGBA color;
</span><span class="cx"> GtkStyleContext* containerContext = getStyleContext(GTK_TYPE_CONTAINER);
</span><span class="cx">
</span><del>- gtk_style_context_get_background_color(containerContext, GTK_STATE_FLAG_NORMAL, &color);
</del><ins>+ gtk_style_context_save(containerContext);
+
+ gtk_style_context_set_state(containerContext, GTK_STATE_FLAG_NORMAL);
+ gtk_style_context_get_background_color(containerContext, gtk_style_context_get_state(containerContext), &color);
</ins><span class="cx"> m_panelColor = color;
</span><del>- gtk_style_context_get_background_color(containerContext, GTK_STATE_FLAG_ACTIVE, &color);
</del><ins>+ gtk_style_context_set_state(containerContext, GTK_STATE_FLAG_ACTIVE);
+ gtk_style_context_get_background_color(containerContext, gtk_style_context_get_state(containerContext), &color);
</ins><span class="cx"> m_sliderColor = color;
</span><del>- gtk_style_context_get_background_color(containerContext, GTK_STATE_FLAG_SELECTED, &color);
</del><ins>+ gtk_style_context_set_state(containerContext, GTK_STATE_FLAG_SELECTED);
+ gtk_style_context_get_background_color(containerContext, gtk_style_context_get_state(containerContext), &color);
</ins><span class="cx"> m_sliderThumbColor = color;
</span><ins>+
+ gtk_style_context_restore(containerContext);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -346,7 +353,7 @@
</span><span class="cx">
</span><span class="cx"> if (interiorFocus) {
</span><span class="cx"> GtkBorder borderWidth;
</span><del>- gtk_style_context_get_border(context, static_cast<GtkStateFlags>(flags), &borderWidth);
</del><ins>+ gtk_style_context_get_border(context, gtk_style_context_get_state(context), &borderWidth);
</ins><span class="cx">
</span><span class="cx"> buttonRect = IntRect(buttonRect.x() + borderWidth.left + focusPad, buttonRect.y() + borderWidth.top + focusPad,
</span><span class="cx"> buttonRect.width() - (2 * focusPad + borderWidth.left + borderWidth.right),
</span><span class="lines">@@ -395,7 +402,8 @@
</span><span class="cx"> gtk_style_context_add_class(context, GTK_STYLE_CLASS_BUTTON);
</span><span class="cx"> gtk_style_context_set_direction(context, static_cast<GtkTextDirection>(gtkTextDirection(style->direction())));
</span><span class="cx">
</span><del>- gtk_style_context_get_border(context, static_cast<GtkStateFlags>(0), &border);
</del><ins>+ gtk_style_context_set_state(context, static_cast<GtkStateFlags>(0));
+ gtk_style_context_get_border(context, gtk_style_context_get_state(context), &border);
</ins><span class="cx">
</span><span class="cx"> gboolean interiorFocus;
</span><span class="cx"> gint focusWidth, focusPad;
</span><span class="lines">@@ -575,9 +583,9 @@
</span><span class="cx"> separatorWidth, innerRect.height());
</span><span class="cx"> } else {
</span><span class="cx"> GtkBorder padding;
</span><del>- gtk_style_context_get_padding(separatorStyleContext, state, &padding);
</del><ins>+ gtk_style_context_get_padding(separatorStyleContext, gtk_style_context_get_state(separatorStyleContext), &padding);
</ins><span class="cx"> GtkBorder border;
</span><del>- gtk_style_context_get_border(separatorStyleContext, state, &border);
</del><ins>+ gtk_style_context_get_border(separatorStyleContext, gtk_style_context_get_state(separatorStyleContext), &border);
</ins><span class="cx">
</span><span class="cx"> if (direction == GTK_TEXT_DIR_LTR)
</span><span class="cx"> separatorPosition.move(-(padding.left + border.left), 0);
</span><span class="lines">@@ -751,9 +759,10 @@
</span><span class="cx"> gtk_style_context_save(context);
</span><span class="cx"> gtk_style_context_add_class(context, GTK_STYLE_CLASS_PROGRESSBAR);
</span><span class="cx">
</span><ins>+ gtk_style_context_set_state(context, static_cast<GtkStateFlags>(0));
</ins><span class="cx">
</span><span class="cx"> GtkBorder padding;
</span><del>- gtk_style_context_get_padding(context, static_cast<GtkStateFlags>(0), &padding);
</del><ins>+ gtk_style_context_get_padding(context, gtk_style_context_get_state(context), &padding);
</ins><span class="cx"> IntRect progressRect(rect.x() + padding.left, rect.y() + padding.top,
</span><span class="cx"> rect.width() - (padding.left + padding.right),
</span><span class="cx"> rect.height() - (padding.top + padding.bottom));
</span><span class="lines">@@ -775,7 +784,7 @@
</span><span class="cx"> static gint spinButtonArrowSize(GtkStyleContext* context)
</span><span class="cx"> {
</span><span class="cx"> PangoFontDescription* fontDescription;
</span><del>- gtk_style_context_get(context, static_cast<GtkStateFlags>(0), "font", &fontDescription, NULL);
</del><ins>+ gtk_style_context_get(context, gtk_style_context_get_state(context), "font", &fontDescription, nullptr);
</ins><span class="cx"> gint fontSize = pango_font_description_get_size(fontDescription);
</span><span class="cx"> gint arrowSize = std::max(PANGO_PIXELS(fontSize), minSpinButtonArrowSize);
</span><span class="cx"> pango_font_description_free(fontDescription);
</span><span class="lines">@@ -788,7 +797,7 @@
</span><span class="cx"> GtkStyleContext* context = getStyleContext(GTK_TYPE_SPIN_BUTTON);
</span><span class="cx">
</span><span class="cx"> GtkBorder padding;
</span><del>- gtk_style_context_get_padding(context, static_cast<GtkStateFlags>(0), &padding);
</del><ins>+ gtk_style_context_get_padding(context, gtk_style_context_get_state(context), &padding);
</ins><span class="cx">
</span><span class="cx"> int width = spinButtonArrowSize(context) + padding.left + padding.right;
</span><span class="cx"> style->setWidth(Length(width, Fixed));
</span><span class="lines">@@ -947,9 +956,9 @@
</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, state, &gdkRGBAColor);
</del><ins>+ gtk_style_context_get_background_color(context, gtk_style_context_get_state(context), &gdkRGBAColor);
</ins><span class="cx"> else
</span><del>- gtk_style_context_get_color(context, state, &gdkRGBAColor);
</del><ins>+ gtk_style_context_get_color(context, gtk_style_context_get_state(context), &gdkRGBAColor);
</ins><span class="cx"> return gdkRGBAColor;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgtkScrollbarThemeGtk3cpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/ScrollbarThemeGtk3.cpp (197247 => 197248)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/ScrollbarThemeGtk3.cpp 2016-02-27 15:02:59 UTC (rev 197247)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/ScrollbarThemeGtk3.cpp 2016-02-27 15:08:43 UTC (rev 197248)
</span><span class="lines">@@ -75,7 +75,8 @@
</span><span class="cx"> static void adjustRectAccordingToMargin(GtkStyleContext* context, GtkStateFlags state, IntRect& rect)
</span><span class="cx"> {
</span><span class="cx"> GtkBorder margin;
</span><del>- gtk_style_context_get_margin(context, state, &margin);
</del><ins>+ gtk_style_context_set_state(context, state);
+ gtk_style_context_get_margin(context, gtk_style_context_get_state(context), &margin);
</ins><span class="cx"> rect.move(margin.left, margin.right);
</span><span class="cx"> rect.contract(margin.left + margin.right, margin.top + margin.bottom);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>