<!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>[198120] releases/WebKitGTK/webkit-2.12/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/198120">198120</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-14 06:08:38 -0700 (Mon, 14 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/197998">r197998</a> - [GTK] Fix rendering of slider input elements
https://bugs.webkit.org/show_bug.cgi?id=155296
Reviewed by Michael Catanzaro.
Use the new gadgets for newer GTK+ and improve a bit the rendering
for previous versions to better match GTK+.
* rendering/RenderThemeGtk.cpp:
(WebCore::createStyleContext): Add ScaleContents and
ScaleHighlight parts that are only used with GTK+ 3.19.
(WebCore::RenderThemeGtk::paintSliderTrack): Use a smaller trough,
centered in the given rectangle to better match GTK+. Also render
the hightlight gadget with GTK+ 3.19.
(WebCore::RenderThemeGtk::paintSliderThumb): Also create the style
context for contents gadget.
(WebCore::RenderThemeGtk::adjustSliderThumbSize): Take into
account the slider border when calculating the slider thumb size.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorerenderingRenderThemeGtkcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderThemeGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (198119 => 198120)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-03-14 13:07:35 UTC (rev 198119)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-03-14 13:08:38 UTC (rev 198120)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2016-03-10 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Fix rendering of slider input elements
+ https://bugs.webkit.org/show_bug.cgi?id=155296
+
+ Reviewed by Michael Catanzaro.
+
+ Use the new gadgets for newer GTK+ and improve a bit the rendering
+ for previous versions to better match GTK+.
+
+ * rendering/RenderThemeGtk.cpp:
+ (WebCore::createStyleContext): Add ScaleContents and
+ ScaleHighlight parts that are only used with GTK+ 3.19.
+ (WebCore::RenderThemeGtk::paintSliderTrack): Use a smaller trough,
+ centered in the given rectangle to better match GTK+. Also render
+ the hightlight gadget with GTK+ 3.19.
+ (WebCore::RenderThemeGtk::paintSliderThumb): Also create the style
+ context for contents gadget.
+ (WebCore::RenderThemeGtk::adjustSliderThumbSize): Take into
+ account the slider border when calculating the slider thumb size.
+
+2016-03-10 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] Scrollbars are broken once again with current GTK+ master
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155292
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorerenderingRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderThemeGtk.cpp (198119 => 198120)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderThemeGtk.cpp 2016-03-14 13:07:35 UTC (rev 198119)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderThemeGtk.cpp 2016-03-14 13:08:38 UTC (rev 198120)
</span><span class="lines">@@ -152,8 +152,10 @@
</span><span class="cx"> ComboBoxButton,
</span><span class="cx"> ComboBoxArrow,
</span><span class="cx"> Scale,
</span><ins>+ ScaleContents,
</ins><span class="cx"> ScaleTrough,
</span><span class="cx"> ScaleSlider,
</span><ins>+ ScaleHighlight,
</ins><span class="cx"> ProgressBar,
</span><span class="cx"> ProgressBarTrough,
</span><span class="cx"> ProgressBarProgress,
</span><span class="lines">@@ -281,6 +283,15 @@
</span><span class="cx"> gtk_widget_path_iter_add_class(path.get(), -1, GTK_STYLE_CLASS_SCALE);
</span><span class="cx"> #endif
</span><span class="cx"> break;
</span><ins>+ case ScaleContents:
+#if GTK_CHECK_VERSION(3, 19, 11)
+ gtk_widget_path_append_type(path.get(), GTK_TYPE_SCALE);
+ gtk_widget_path_iter_set_object_name(path.get(), -1, "contents");
+ gtk_widget_path_iter_add_class(path.get(), -1, GTK_STYLE_CLASS_SCALE);
+#else
+ ASSERT_NOT_REACHED();
+#endif
+ break;
</ins><span class="cx"> case ScaleTrough:
</span><span class="cx"> gtk_widget_path_append_type(path.get(), GTK_TYPE_SCALE);
</span><span class="cx"> #if GTK_CHECK_VERSION(3, 19, 2)
</span><span class="lines">@@ -299,6 +310,15 @@
</span><span class="cx"> gtk_widget_path_iter_add_class(path.get(), -1, GTK_STYLE_CLASS_SLIDER);
</span><span class="cx"> #endif
</span><span class="cx"> break;
</span><ins>+ case ScaleHighlight:
+#if GTK_CHECK_VERSION(3, 19, 11)
+ gtk_widget_path_append_type(path.get(), GTK_TYPE_SCALE);
+ gtk_widget_path_iter_set_object_name(path.get(), -1, "highlight");
+ gtk_widget_path_iter_add_class(path.get(), -1, GTK_STYLE_CLASS_SCALE);
+#else
+ ASSERT_NOT_REACHED();
+#endif
+ break;
</ins><span class="cx"> case ProgressBar:
</span><span class="cx"> gtk_widget_path_append_type(path.get(), GTK_TYPE_PROGRESS_BAR);
</span><span class="cx"> #if GTK_CHECK_VERSION(3, 19, 2)
</span><span class="lines">@@ -1074,23 +1094,62 @@
</span><span class="cx"> bool RenderThemeGtk::paintSliderTrack(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</span><span class="cx"> {
</span><span class="cx"> ControlPart part = renderObject.style().appearance();
</span><del>- ASSERT_UNUSED(part, part == SliderHorizontalPart || part == SliderVerticalPart);
</del><ins>+ ASSERT(part == SliderHorizontalPart || part == SliderVerticalPart);
</ins><span class="cx">
</span><span class="cx"> GRefPtr<GtkStyleContext> parentContext = createStyleContext(Scale);
</span><span class="cx"> gtk_style_context_add_class(parentContext.get(), part == SliderHorizontalPart ? GTK_STYLE_CLASS_HORIZONTAL : GTK_STYLE_CLASS_VERTICAL);
</span><ins>+#if GTK_CHECK_VERSION(3, 19, 11)
+ GRefPtr<GtkStyleContext> contentsContext = createStyleContext(ScaleContents, parentContext.get());
+ GRefPtr<GtkStyleContext> context = createStyleContext(ScaleTrough, contentsContext.get());
+#else
</ins><span class="cx"> GRefPtr<GtkStyleContext> context = createStyleContext(ScaleTrough, parentContext.get());
</span><ins>+#endif
</ins><span class="cx"> gtk_style_context_set_direction(context.get(), gtkTextDirection(renderObject.style().direction()));
</span><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="cx">
</span><del>- gtk_render_background(context.get(), paintInfo.context().platformContext()->cr(), rect.x(), rect.y(), rect.width(), rect.height());
- gtk_render_frame(context.get(), paintInfo.context().platformContext()->cr(), rect.x(), rect.y(), rect.width(), rect.height());
</del><ins>+ IntRect sliderRect = rect;
+ // GTK+ uses the slider thumb size and margins to calculate the trough size, but in WebKit we render the thumb and
+ // the slider track separately and the track rectangle we receive here can't be used to apply the GTK+ CSS sizes
+ // and margins. So we use a maximum fixed size for the trough to match at least Adwaita, but that should look
+ // good in other themes as well.
+ static const int sliderSize = 4;
</ins><span class="cx">
</span><ins>+ if (part == SliderHorizontalPart) {
+ sliderRect.setHeight(std::min(rect.height(), sliderSize));
+ sliderRect.move(0, (rect.height() - sliderRect.height()) / 2);
+ } else {
+ sliderRect.setWidth(std::min(rect.width(), sliderSize));
+ sliderRect.move((rect.width() - sliderRect.width()) / 2, 0);
+ }
+
+ gtk_render_background(context.get(), paintInfo.context().platformContext()->cr(), sliderRect.x(), sliderRect.y(), sliderRect.width(), sliderRect.height());
+ gtk_render_frame(context.get(), paintInfo.context().platformContext()->cr(), sliderRect.x(), sliderRect.y(), sliderRect.width(), sliderRect.height());
+
+#if GTK_CHECK_VERSION(3, 19, 11)
+ GRefPtr<GtkStyleContext> highlightContext = createStyleContext(ScaleHighlight, context.get());
+ LayoutPoint thumbLocation;
+ if (is<HTMLInputElement>(renderObject.node())) {
+ auto& input = downcast<HTMLInputElement>(*renderObject.node());
+ if (auto* element = input.sliderThumbElement())
+ thumbLocation = element->renderBox()->location();
+ }
+
+ IntRect highlightRect = sliderRect;
+ if (part == SliderHorizontalPart)
+ highlightRect.setWidth(thumbLocation.x());
+ else
+ highlightRect.setHeight(thumbLocation.y());
+
+ gtk_render_background(highlightContext.get(), paintInfo.context().platformContext()->cr(), highlightRect.x(), highlightRect.y(), highlightRect.width(), highlightRect.height());
+ gtk_render_frame(highlightContext.get(), paintInfo.context().platformContext()->cr(), highlightRect.x(), highlightRect.y(), highlightRect.width(), highlightRect.height());
+#endif
+
</ins><span class="cx"> if (isFocused(renderObject)) {
</span><span class="cx"> gint focusWidth, focusPad;
</span><span class="cx"> gtk_style_context_get_style(context.get(), "focus-line-width", &focusWidth, "focus-padding", &focusPad, nullptr);
</span><del>- IntRect focusRect(rect);
</del><ins>+ IntRect focusRect(sliderRect);
</ins><span class="cx"> focusRect.inflate(focusWidth + focusPad);
</span><span class="cx"> gtk_render_focus(context.get(), paintInfo.context().platformContext()->cr(), focusRect.x(), focusRect.y(), focusRect.width(), focusRect.height());
</span><span class="cx"> }
</span><span class="lines">@@ -1106,7 +1165,12 @@
</span><span class="cx"> // FIXME: The entire slider is too wide, stretching the thumb into an oval rather than a circle.
</span><span class="cx"> GRefPtr<GtkStyleContext> parentContext = createStyleContext(Scale);
</span><span class="cx"> gtk_style_context_add_class(parentContext.get(), part == SliderThumbHorizontalPart ? GTK_STYLE_CLASS_HORIZONTAL : GTK_STYLE_CLASS_VERTICAL);
</span><ins>+#if GTK_CHECK_VERSION(3, 19, 11)
+ GRefPtr<GtkStyleContext> contentsContext = createStyleContext(ScaleContents, parentContext.get());
+ GRefPtr<GtkStyleContext> troughContext = createStyleContext(ScaleTrough, contentsContext.get());
+#else
</ins><span class="cx"> GRefPtr<GtkStyleContext> troughContext = createStyleContext(ScaleTrough, parentContext.get());
</span><ins>+#endif
</ins><span class="cx"> GRefPtr<GtkStyleContext> context = createStyleContext(ScaleSlider, troughContext.get());
</span><span class="cx"> gtk_style_context_set_direction(context.get(), gtkTextDirection(renderObject.style().direction()));
</span><span class="cx">
</span><span class="lines">@@ -1133,7 +1197,18 @@
</span><span class="cx">
</span><span class="cx"> GRefPtr<GtkStyleContext> context = createStyleContext(Scale);
</span><span class="cx"> gint sliderWidth, sliderLength;
</span><ins>+#if GTK_CHECK_VERSION(3, 19, 11)
+ GRefPtr<GtkStyleContext> contentsContext = createStyleContext(ScaleContents, context.get());
+ GRefPtr<GtkStyleContext> troughContext = createStyleContext(ScaleTrough, contentsContext.get());
+ GRefPtr<GtkStyleContext> sliderContext = createStyleContext(ScaleSlider, troughContext.get());
+ gtk_style_context_get(sliderContext.get(), gtk_style_context_get_state(sliderContext.get()), "min-width", &sliderWidth, "min-height", &sliderLength, nullptr);
+ GtkBorder border;
+ gtk_style_context_get_border(sliderContext.get(), gtk_style_context_get_state(sliderContext.get()), &border);
+ sliderWidth += border.left + border.right;
+ sliderLength += border.top + border.bottom;
+#else
</ins><span class="cx"> gtk_style_context_get_style(context.get(), "slider-width", &sliderWidth, "slider-length", &sliderLength, nullptr);
</span><ins>+#endif
</ins><span class="cx"> if (part == SliderThumbHorizontalPart) {
</span><span class="cx"> style.setWidth(Length(sliderLength, Fixed));
</span><span class="cx"> style.setHeight(Length(sliderWidth, Fixed));
</span></span></pre>
</div>
</div>
</body>
</html>