<!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>[198007] releases/WebKitGTK/webkit-2.10/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/198007">198007</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-11 04:58:41 -0800 (Fri, 11 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/197997">r197997</a> - [GTK] Scrollbars are broken once again with current GTK+ master
https://bugs.webkit.org/show_bug.cgi?id=155292
Reviewed by Michael Catanzaro.
Most of the trough theming properties have been moved to the
scrollbar, and a new gadget "contents" has been added between the
scrollbar and its children.
* platform/gtk/ScrollbarThemeGtk.cpp:
(WebCore::ScrollbarThemeGtk::getOrCreateStyleContext): Add
left/bottom style classes to ensure the scrollbars border is taken
into account and rendered.
(WebCore::ScrollbarThemeGtk::paintTrackBackground): Also create
style context for contents gadget.
(WebCore::ScrollbarThemeGtk::paintThumb): Ditto.
(WebCore::ScrollbarThemeGtk::paintButton): Ditto.
(WebCore::ScrollbarThemeGtk::scrollbarThickness): Take the
scrollbar border into account.
(WebCore::ScrollbarThemeGtk::buttonSize): Also create style
context for contents gadget.
(WebCore::ScrollbarThemeGtk::getStepperSpacing): Ditto.
(WebCore::ScrollbarThemeGtk::minimumThumbLength): Ditto.
(WebCore::ScrollbarThemeGtk::thumbFatness): Ditto.
(WebCore::ScrollbarThemeGtk::getTroughBorder): Take the scrollbar
border into account.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgtkScrollbarThemeGtkcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (198006 => 198007)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-03-11 12:58:28 UTC (rev 198006)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-03-11 12:58:41 UTC (rev 198007)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-03-10 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Scrollbars are broken once again with current GTK+ master
+ https://bugs.webkit.org/show_bug.cgi?id=155292
+
+ Reviewed by Michael Catanzaro.
+
+ Most of the trough theming properties have been moved to the
+ scrollbar, and a new gadget "contents" has been added between the
+ scrollbar and its children.
+
+ * platform/gtk/ScrollbarThemeGtk.cpp:
+ (WebCore::ScrollbarThemeGtk::getOrCreateStyleContext): Add
+ left/bottom style classes to ensure the scrollbars border is taken
+ into account and rendered.
+ (WebCore::ScrollbarThemeGtk::paintTrackBackground): Also create
+ style context for contents gadget.
+ (WebCore::ScrollbarThemeGtk::paintThumb): Ditto.
+ (WebCore::ScrollbarThemeGtk::paintButton): Ditto.
+ (WebCore::ScrollbarThemeGtk::scrollbarThickness): Take the
+ scrollbar border into account.
+ (WebCore::ScrollbarThemeGtk::buttonSize): Also create style
+ context for contents gadget.
+ (WebCore::ScrollbarThemeGtk::getStepperSpacing): Ditto.
+ (WebCore::ScrollbarThemeGtk::minimumThumbLength): Ditto.
+ (WebCore::ScrollbarThemeGtk::thumbFatness): Ditto.
+ (WebCore::ScrollbarThemeGtk::getTroughBorder): Take the scrollbar
+ border into account.
+
</ins><span class="cx"> 2016-03-04 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Scrollbars are broken again with GTK+ >= 3.19.11
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformgtkScrollbarThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp (198006 => 198007)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp 2016-03-11 12:58:28 UTC (rev 198006)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp 2016-03-11 12:58:41 UTC (rev 198007)
</span><span class="lines">@@ -187,11 +187,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifndef GTK_API_VERSION_2
</span><del>-static inline const char* orientationStyleClass(ScrollbarOrientation orientation)
-{
- return orientation == VerticalScrollbar ? "vertical" : "horizontal";
-}
-
</del><span class="cx"> GRefPtr<GtkStyleContext> ScrollbarThemeGtk::getOrCreateStyleContext(ScrollbarOrientation orientation)
</span><span class="cx"> {
</span><span class="cx"> if (m_cachedStyleContext)
</span><span class="lines">@@ -205,7 +200,8 @@
</span><span class="cx"> #else
</span><span class="cx"> gtk_widget_path_iter_add_class(path.get(), -1, "scrollbar");
</span><span class="cx"> #endif
</span><del>- gtk_widget_path_iter_add_class(path.get(), -1, orientationStyleClass(orientation));
</del><ins>+ gtk_widget_path_iter_add_class(path.get(), -1, orientation == VerticalScrollbar ? "vertical" : "horizontal");
+ gtk_widget_path_iter_add_class(path.get(), -1, orientation == VerticalScrollbar ? "right" : "bottom");
</ins><span class="cx"> gtk_style_context_set_path(styleContext.get(), path.get());
</span><span class="cx">
</span><span class="cx"> return styleContext;
</span><span class="lines">@@ -298,10 +294,22 @@
</span><span class="cx"> if (troughUnderSteppers(scrollbar))
</span><span class="cx"> fullScrollbarRect = IntRect(scrollbar.x(), scrollbar.y(), scrollbar.width(), scrollbar.height());
</span><span class="cx">
</span><del>- GRefPtr<GtkStyleContext> styleContext = createChildStyleContext(parentStyleContext.get(), "trough");
- adjustRectAccordingToMargin(styleContext.get(), 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());
</del><ins>+ IntRect adjustedRect = fullScrollbarRect;
+ adjustRectAccordingToMargin(parentStyleContext.get(), adjustedRect);
+ gtk_render_background(parentStyleContext.get(), context.platformContext()->cr(), adjustedRect.x(), adjustedRect.y(), adjustedRect.width(), adjustedRect.height());
+ gtk_render_frame(parentStyleContext.get(), context.platformContext()->cr(), adjustedRect.x(), adjustedRect.y(), adjustedRect.width(), adjustedRect.height());
+
+ GRefPtr<GtkStyleContext> contentsStyleContext = createChildStyleContext(parentStyleContext.get(), "contents");
+ adjustedRect = fullScrollbarRect;
+ adjustRectAccordingToMargin(contentsStyleContext.get(), adjustedRect);
+ gtk_render_background(contentsStyleContext.get(), context.platformContext()->cr(), adjustedRect.x(), adjustedRect.y(), adjustedRect.width(), adjustedRect.height());
+ gtk_render_frame(contentsStyleContext.get(), context.platformContext()->cr(), adjustedRect.x(), adjustedRect.y(), adjustedRect.width(), adjustedRect.height());
+
+ GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(contentsStyleContext.get(), "trough");
+ adjustedRect = fullScrollbarRect;
+ adjustRectAccordingToMargin(troughStyleContext.get(), adjustedRect);
+ gtk_render_background(troughStyleContext.get(), context.platformContext()->cr(), adjustedRect.x(), adjustedRect.y(), adjustedRect.width(), adjustedRect.height());
+ gtk_render_frame(troughStyleContext.get(), context.platformContext()->cr(), adjustedRect.x(), adjustedRect.y(), adjustedRect.width(), adjustedRect.height());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollbarThemeGtk::paintScrollbarBackground(GraphicsContext& context, Scrollbar& scrollbar)
</span><span class="lines">@@ -314,7 +322,8 @@
</span><span class="cx"> {
</span><span class="cx"> ScrollbarOrientation orientation = scrollbar.orientation();
</span><span class="cx"> GRefPtr<GtkStyleContext> parentStyleContext = getOrCreateStyleContext(orientation);
</span><del>- GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(parentStyleContext.get(), "trough");
</del><ins>+ GRefPtr<GtkStyleContext> contentsStyleContext = createChildStyleContext(parentStyleContext.get(), "contents");
+ GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(contentsStyleContext.get(), "trough");
</ins><span class="cx"> GRefPtr<GtkStyleContext> styleContext = createChildStyleContext(troughStyleContext.get(), "slider");
</span><span class="cx">
</span><span class="cx"> unsigned flags = 0;
</span><span class="lines">@@ -334,7 +343,8 @@
</span><span class="cx"> {
</span><span class="cx"> ScrollbarOrientation orientation = scrollbar.orientation();
</span><span class="cx"> GRefPtr<GtkStyleContext> parentStyleContext = getOrCreateStyleContext(orientation);
</span><del>- GRefPtr<GtkStyleContext> styleContext = createChildStyleContext(parentStyleContext.get(), "button");
</del><ins>+ GRefPtr<GtkStyleContext> contentsStyleContext = createChildStyleContext(parentStyleContext.get(), "contents");
+ GRefPtr<GtkStyleContext> styleContext = createChildStyleContext(contentsStyleContext.get(), "button");
</ins><span class="cx">
</span><span class="cx"> unsigned flags = 0;
</span><span class="cx"> if ((BackButtonStartPart == part && scrollbar.currentPos())
</span><span class="lines">@@ -454,10 +464,18 @@
</span><span class="cx"> {
</span><span class="cx"> GtkBorder troughBorder;
</span><span class="cx"> #if GTK_CHECK_VERSION(3, 19, 11)
</span><del>- GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(styleContext, "trough");
</del><ins>+ GRefPtr<GtkStyleContext> contentsStyleContext = createChildStyleContext(styleContext, "contents");
+ GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(contentsStyleContext.get(), "trough");
</ins><span class="cx"> GRefPtr<GtkStyleContext> sliderStyleContext = createChildStyleContext(troughStyleContext.get(), "slider");
</span><span class="cx"> int thumbFat = thumbFatness(sliderStyleContext.get(), orientation);
</span><span class="cx"> getTroughBorder(troughStyleContext.get(), &troughBorder);
</span><ins>+ // Since GTK+ 3.19 the scrollbar can have its own border too.
+ GtkBorder border;
+ gtk_style_context_get_border(styleContext, gtk_style_context_get_state(styleContext), &border);
+ troughBorder.left += border.left;
+ troughBorder.right += border.right;
+ troughBorder.top += border.top;
+ troughBorder.bottom += border.bottom;
</ins><span class="cx"> #else
</span><span class="cx"> int thumbFat = thumbFatness(styleContext, orientation);
</span><span class="cx"> getTroughBorder(styleContext, &troughBorder);
</span><span class="lines">@@ -477,7 +495,8 @@
</span><span class="cx"> {
</span><span class="cx"> GRefPtr<GtkStyleContext> styleContext = getOrCreateStyleContext(scrollbar.orientation());
</span><span class="cx"> #if GTK_CHECK_VERSION(3, 19, 11)
</span><del>- GRefPtr<GtkStyleContext> buttonStyleContext = createChildStyleContext(styleContext.get(), "button");
</del><ins>+ GRefPtr<GtkStyleContext> contentsStyleContext = createChildStyleContext(styleContext.get(), "contents");
+ GRefPtr<GtkStyleContext> buttonStyleContext = createChildStyleContext(contentsStyleContext.get(), "button");
</ins><span class="cx"> switch (buttonPart) {
</span><span class="cx"> case BackButtonStartPart:
</span><span class="cx"> case ForwardButtonStartPart:
</span><span class="lines">@@ -516,7 +535,8 @@
</span><span class="cx"> {
</span><span class="cx"> GRefPtr<GtkStyleContext> styleContext = getOrCreateStyleContext(scrollbar.orientation());
</span><span class="cx"> #if GTK_CHECK_VERSION(3, 19, 11)
</span><del>- GRefPtr<GtkStyleContext> buttonStyleContext = createChildStyleContext(styleContext.get(), "button");
</del><ins>+ GRefPtr<GtkStyleContext> contentsStyleContext = createChildStyleContext(styleContext.get(), "contents");
+ GRefPtr<GtkStyleContext> buttonStyleContext = createChildStyleContext(contentsStyleContext.get(), "button");
</ins><span class="cx"> switch (buttonPart) {
</span><span class="cx"> case BackButtonStartPart:
</span><span class="cx"> case ForwardButtonStartPart:
</span><span class="lines">@@ -556,7 +576,8 @@
</span><span class="cx"> GRefPtr<GtkStyleContext> styleContext = getOrCreateStyleContext(scrollbar.orientation());
</span><span class="cx"> int minThumbLength = 0;
</span><span class="cx"> #if GTK_CHECK_VERSION(3, 19, 11)
</span><del>- GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(styleContext.get(), "trough");
</del><ins>+ GRefPtr<GtkStyleContext> contentsStyleContext = createChildStyleContext(styleContext.get(), "contents");
+ GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(contentsStyleContext.get(), "trough");
</ins><span class="cx"> GRefPtr<GtkStyleContext> sliderStyleContext = createChildStyleContext(troughStyleContext.get(), "slider");
</span><span class="cx"> gtk_style_context_get(sliderStyleContext.get(), gtk_style_context_get_state(sliderStyleContext.get()),
</span><span class="cx"> scrollbar.orientation() == VerticalScrollbar ? "min-height" : "min-width", &minThumbLength, nullptr);
</span><span class="lines">@@ -591,7 +612,8 @@
</span><span class="cx"> {
</span><span class="cx"> GRefPtr<GtkStyleContext> styleContext = getOrCreateStyleContext(scrollbar.orientation());
</span><span class="cx"> #if GTK_CHECK_VERSION(3, 19, 11)
</span><del>- GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(styleContext.get(), "trough");
</del><ins>+ GRefPtr<GtkStyleContext> contentsStyleContext = createChildStyleContext(styleContext.get(), "contents");
+ GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(contentsStyleContext.get(), "trough");
</ins><span class="cx"> GRefPtr<GtkStyleContext> sliderStyleContext = createChildStyleContext(troughStyleContext.get(), "slider");
</span><span class="cx"> return thumbFatness(sliderStyleContext.get(), scrollbar.orientation());
</span><span class="cx"> #else
</span><span class="lines">@@ -614,8 +636,16 @@
</span><span class="cx"> {
</span><span class="cx"> GRefPtr<GtkStyleContext> styleContext = getOrCreateStyleContext(scrollbar.orientation());
</span><span class="cx"> #if GTK_CHECK_VERSION(3, 19, 11)
</span><del>- GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(styleContext.get(), "trough");
</del><ins>+ GRefPtr<GtkStyleContext> contentsStyleContext = createChildStyleContext(styleContext.get(), "contents");
+ GRefPtr<GtkStyleContext> troughStyleContext = createChildStyleContext(contentsStyleContext.get(), "trough");
</ins><span class="cx"> getTroughBorder(troughStyleContext.get(), border);
</span><ins>+ // Since GTK+ 3.19 the scrollbar can have its own border too.
+ GtkBorder scrollbarBorder;
+ gtk_style_context_get_border(styleContext.get(), gtk_style_context_get_state(styleContext.get()), &scrollbarBorder);
+ border->left += scrollbarBorder.left;
+ border->right += scrollbarBorder.right;
+ border->top += scrollbarBorder.top;
+ border->bottom += scrollbarBorder.bottom;
</ins><span class="cx"> #else
</span><span class="cx"> getTroughBorder(styleContext.get(), border);
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>