<!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>[205853] 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/205853">205853</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-12 23:15:09 -0700 (Mon, 12 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Scrollbar too large
https://bugs.webkit.org/show_bug.cgi?id=161735
Reviewed by Michael Catanzaro.
We were not calculating the total scrollbar size correctly when the theme defines a minimum width/height. In
that case we need to take the extra size into account (border, margin, padding), but not adding the minimum
size. We were also adjusting the thumb position when rendering in indicator mode, but we really need to adjust
the whole rectangle. This worked in Adwaita because it uses a transparent track when in indicator mode. We are
also now taking into account the text direction when doing this adjustment for the indicator mode.
* platform/gtk/ScrollbarThemeGtk.cpp:
(WebCore::ScrollbarThemeGtk::paint):
(WebCore::ScrollbarThemeGtk::scrollbarThickness):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkScrollbarThemeGtkcpp">trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205852 => 205853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-13 06:12:42 UTC (rev 205852)
+++ trunk/Source/WebCore/ChangeLog 2016-09-13 06:15:09 UTC (rev 205853)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2016-09-12 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Scrollbar too large
+ https://bugs.webkit.org/show_bug.cgi?id=161735
+
+ Reviewed by Michael Catanzaro.
+
+ We were not calculating the total scrollbar size correctly when the theme defines a minimum width/height. In
+ that case we need to take the extra size into account (border, margin, padding), but not adding the minimum
+ size. We were also adjusting the thumb position when rendering in indicator mode, but we really need to adjust
+ the whole rectangle. This worked in Adwaita because it uses a transparent track when in indicator mode. We are
+ also now taking into account the text direction when doing this adjustment for the indicator mode.
+
+ * platform/gtk/ScrollbarThemeGtk.cpp:
+ (WebCore::ScrollbarThemeGtk::paint):
+ (WebCore::ScrollbarThemeGtk::scrollbarThickness):
+
+2016-09-12 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] Crash of WebProcess on the last WebView disconnect (take two)
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161842
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkScrollbarThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp (205852 => 205853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp 2016-09-13 06:12:42 UTC (rev 205852)
+++ trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp 2016-09-13 06:15:09 UTC (rev 205853)
</span><span class="lines">@@ -476,10 +476,12 @@
</span><span class="cx"> if (!rect.intersects(damageRect))
</span><span class="cx"> return true;
</span><span class="cx">
</span><ins>+ bool scrollbarOnLeft = scrollbar.scrollableArea().shouldPlaceBlockDirectionScrollbarOnLeft();
+
</ins><span class="cx"> RenderThemeGadget::Info info = { RenderThemeGadget::Type::Scrollbar, "scrollbar", scrollbarPartStateFlags(scrollbar, AllParts, true), { } };
</span><span class="cx"> if (scrollbar.orientation() == VerticalScrollbar) {
</span><span class="cx"> info.classList.append("vertical");
</span><del>- info.classList.append("right");
</del><ins>+ info.classList.append(scrollbarOnLeft ? "left" : "right");
</ins><span class="cx"> } else {
</span><span class="cx"> info.classList.append("horizontal");
</span><span class="cx"> info.classList.append("bottom");
</span><span class="lines">@@ -525,6 +527,33 @@
</span><span class="cx"> children, scrollbarGadget.get());
</span><span class="cx"> RenderThemeGadget* troughGadget = contentsGadget->child(troughPosition);
</span><span class="cx">
</span><ins>+ IntSize preferredSize = contentsGadget->preferredSize();
+ std::unique_ptr<RenderThemeGadget> sliderGadget;
+ int thumbSize = thumbLength(scrollbar);
+ if (thumbSize) {
+ info.name = "slider";
+ info.state = scrollbarPartStateFlags(scrollbar, ThumbPart);
+ sliderGadget = RenderThemeGadget::create(info, troughGadget);
+ preferredSize = preferredSize.expandedTo(sliderGadget->preferredSize());
+ }
+ preferredSize += scrollbarGadget->preferredSize() - scrollbarGadget->minimumSize();
+
+ FloatRect contentsRect(rect);
+ // When using overlay scrollbars we always claim the size of the scrollbar when hovered, so when
+ // drawing the indicator we need to adjust the rectangle to its actual size in indicator mode.
+ if (scrollbar.orientation() == VerticalScrollbar) {
+ if (rect.width() != preferredSize.width()) {
+ if (!scrollbarOnLeft)
+ contentsRect.move(std::abs(rect.width() - preferredSize.width()), 0);
+ contentsRect.setWidth(preferredSize.width());
+ }
+ } else {
+ if (rect.height() != preferredSize.height()) {
+ contentsRect.move(0, std::abs(rect.height() - preferredSize.height()));
+ contentsRect.setHeight(preferredSize.height());
+ }
+ }
+
</ins><span class="cx"> if (opacity != 1) {
</span><span class="cx"> graphicsContext.save();
</span><span class="cx"> graphicsContext.clip(damageRect);
</span><span class="lines">@@ -531,8 +560,7 @@
</span><span class="cx"> graphicsContext.beginTransparencyLayer(opacity);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- FloatRect contentsRect;
- scrollbarGadget->render(graphicsContext.platformContext()->cr(), rect, &contentsRect);
</del><ins>+ scrollbarGadget->render(graphicsContext.platformContext()->cr(), contentsRect, &contentsRect);
</ins><span class="cx"> contentsGadget->render(graphicsContext.platformContext()->cr(), contentsRect, &contentsRect);
</span><span class="cx">
</span><span class="cx"> if (steppers.contains(RenderThemeScrollbarGadget::Steppers::Backward)) {
</span><span class="lines">@@ -606,25 +634,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> troughGadget->render(graphicsContext.platformContext()->cr(), contentsRect, &contentsRect);
</span><del>-
- if (int thumbSize = thumbLength(scrollbar)) {
- info.name = "slider";
- info.state = scrollbarPartStateFlags(scrollbar, ThumbPart);
- auto sliderGadget = RenderThemeGadget::create(info, troughGadget);
-
- // When using overlay scrollbars we always claim the size of the scrollbar when hovered, so when
- // drawing the indicator we need to adjust the rectangle to its actual size in indicator mode.
- bool isIndicator = m_usesOverlayScrollbars && scrollbar.hoveredPart() == NoPart;
</del><ins>+ if (sliderGadget) {
</ins><span class="cx"> if (scrollbar.orientation() == VerticalScrollbar) {
</span><del>- int sliderWidth = sliderGadget->preferredSize().width();
- contentsRect.move(isIndicator ? contentsRect.width() - sliderWidth : 0, thumbPosition(scrollbar));
- contentsRect.setWidth(sliderWidth);
</del><ins>+ contentsRect.move(0, thumbPosition(scrollbar));
+ contentsRect.setWidth(sliderGadget->preferredSize().width());
</ins><span class="cx"> contentsRect.setHeight(thumbSize);
</span><span class="cx"> } else {
</span><del>- int sliderHeight = sliderGadget->preferredSize().height();
- contentsRect.move(thumbPosition(scrollbar), isIndicator ? contentsRect.height() - sliderHeight : 0);
</del><ins>+ contentsRect.move(thumbPosition(scrollbar), 0);
</ins><span class="cx"> contentsRect.setWidth(thumbSize);
</span><del>- contentsRect.setHeight(sliderHeight);
</del><ins>+ contentsRect.setHeight(sliderGadget->preferredSize().height());
</ins><span class="cx"> }
</span><span class="cx"> if (contentsRect.intersects(damageRect))
</span><span class="cx"> sliderGadget->render(graphicsContext.platformContext()->cr(), contentsRect);
</span><span class="lines">@@ -850,10 +868,9 @@
</span><span class="cx"> auto contentsGadget = std::make_unique<RenderThemeBoxGadget>(info, GTK_ORIENTATION_VERTICAL, children, scrollbarGadget.get());
</span><span class="cx"> info.name = "slider";
</span><span class="cx"> auto sliderGadget = RenderThemeGadget::create(info, contentsGadget->child(troughPositon));
</span><del>- IntSize preferredSize = scrollbarGadget->preferredSize();
</del><span class="cx"> IntSize contentsPreferredSize = contentsGadget->preferredSize();
</span><span class="cx"> contentsPreferredSize = contentsPreferredSize.expandedTo(sliderGadget->preferredSize());
</span><del>- preferredSize += contentsPreferredSize;
</del><ins>+ IntSize preferredSize = contentsPreferredSize + scrollbarGadget->preferredSize() - scrollbarGadget->minimumSize();
</ins><span class="cx">
</span><span class="cx"> return preferredSize.width();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>