<!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>[200173] 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/200173">200173</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-27 23:20:10 -0700 (Wed, 27 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Overlay scrollbars with steppers enabled render incorrectly
https://bugs.webkit.org/show_bug.cgi?id=156988
Reviewed by Michael Catanzaro.
Fix rendering of scrollbars when using GTK+ themes having stepper buttons.
* platform/gtk/RenderThemeGadget.cpp:
(WebCore::RenderThemeBoxGadget::RenderThemeBoxGadget): Receive the box orientation as constructor parameter.
(WebCore::RenderThemeBoxGadget::preferredSize): Fix the preferred size calculation taking into account the box orientation.
(WebCore::RenderThemeScrollbarGadget::renderStepper): New method to render scrollbar steppers.
* platform/gtk/RenderThemeGadget.h:
(WebCore::RenderThemeGadget::context): Make this public instead of protected.
* platform/gtk/ScrollAnimatorGtk.cpp:
(WebCore::ScrollAnimatorGtk::updateOverlayScrollbarsOpacity): Invalidate the whole scrollbars instead of just
the thumb when opacity changes, because themes can actually render the trough or even stepper buttons when in
indicator mode too.
* platform/gtk/ScrollbarThemeGtk.cpp:
(WebCore::ScrollbarThemeGtk::hasButtons): Properly implement this method instead of returning true unconditionally.
(WebCore::contentsGadgetForLayout): Pass orientation to RenderThemeBoxGadget constructor.
(WebCore::ScrollbarThemeGtk::trackRect): Fix the calculation of the track rect taking stepper buttons into account.
(WebCore::ScrollbarThemeGtk::backButtonRect): Fix the calculation of the stepper button rectangle.
(WebCore::ScrollbarThemeGtk::forwardButtonRect): Ditto.
(WebCore::ScrollbarThemeGtk::paint): Use RenderThemeScrollbarGadget::renderStepper() to render the stepper
buttons, and fix the calculation of the steppers button rectangle.
(WebCore::ScrollbarThemeGtk::handleMousePressEvent): Handle clicks on stepper buttons.
(WebCore::ScrollbarThemeGtk::scrollbarThickness): Fix the calculation of the scrollbar thickness.
(WebCore::ScrollbarThemeGtk::minimumThumbLength): Pass orientation to RenderThemeBoxGadget constructor.
* platform/gtk/ScrollbarThemeGtk.h:
* rendering/RenderThemeGtk.cpp:
(WebCore::menuListColor): Ditto.
(WebCore::RenderThemeGtk::popupInternalPaddingBox): Ditto.
(WebCore::RenderThemeGtk::paintMenuList): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkRenderThemeGadgetcpp">trunk/Source/WebCore/platform/gtk/RenderThemeGadget.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkRenderThemeGadgeth">trunk/Source/WebCore/platform/gtk/RenderThemeGadget.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkScrollAnimatorGtkcpp">trunk/Source/WebCore/platform/gtk/ScrollAnimatorGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkScrollbarThemeGtkcpp">trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkScrollbarThemeGtkh">trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.h</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 (200172 => 200173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-28 05:41:54 UTC (rev 200172)
+++ trunk/Source/WebCore/ChangeLog 2016-04-28 06:20:10 UTC (rev 200173)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2016-04-27 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Overlay scrollbars with steppers enabled render incorrectly
+ https://bugs.webkit.org/show_bug.cgi?id=156988
+
+ Reviewed by Michael Catanzaro.
+
+ Fix rendering of scrollbars when using GTK+ themes having stepper buttons.
+
+ * platform/gtk/RenderThemeGadget.cpp:
+ (WebCore::RenderThemeBoxGadget::RenderThemeBoxGadget): Receive the box orientation as constructor parameter.
+ (WebCore::RenderThemeBoxGadget::preferredSize): Fix the preferred size calculation taking into account the box orientation.
+ (WebCore::RenderThemeScrollbarGadget::renderStepper): New method to render scrollbar steppers.
+ * platform/gtk/RenderThemeGadget.h:
+ (WebCore::RenderThemeGadget::context): Make this public instead of protected.
+ * platform/gtk/ScrollAnimatorGtk.cpp:
+ (WebCore::ScrollAnimatorGtk::updateOverlayScrollbarsOpacity): Invalidate the whole scrollbars instead of just
+ the thumb when opacity changes, because themes can actually render the trough or even stepper buttons when in
+ indicator mode too.
+ * platform/gtk/ScrollbarThemeGtk.cpp:
+ (WebCore::ScrollbarThemeGtk::hasButtons): Properly implement this method instead of returning true unconditionally.
+ (WebCore::contentsGadgetForLayout): Pass orientation to RenderThemeBoxGadget constructor.
+ (WebCore::ScrollbarThemeGtk::trackRect): Fix the calculation of the track rect taking stepper buttons into account.
+ (WebCore::ScrollbarThemeGtk::backButtonRect): Fix the calculation of the stepper button rectangle.
+ (WebCore::ScrollbarThemeGtk::forwardButtonRect): Ditto.
+ (WebCore::ScrollbarThemeGtk::paint): Use RenderThemeScrollbarGadget::renderStepper() to render the stepper
+ buttons, and fix the calculation of the steppers button rectangle.
+ (WebCore::ScrollbarThemeGtk::handleMousePressEvent): Handle clicks on stepper buttons.
+ (WebCore::ScrollbarThemeGtk::scrollbarThickness): Fix the calculation of the scrollbar thickness.
+ (WebCore::ScrollbarThemeGtk::minimumThumbLength): Pass orientation to RenderThemeBoxGadget constructor.
+ * platform/gtk/ScrollbarThemeGtk.h:
+ * rendering/RenderThemeGtk.cpp:
+ (WebCore::menuListColor): Ditto.
+ (WebCore::RenderThemeGtk::popupInternalPaddingBox): Ditto.
+ (WebCore::RenderThemeGtk::paintMenuList): Ditto.
+
</ins><span class="cx"> 2016-04-27 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> SVG SMIL animations run at less than 60fps
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkRenderThemeGadgetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGadget.cpp (200172 => 200173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/RenderThemeGadget.cpp 2016-04-28 05:41:54 UTC (rev 200172)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGadget.cpp 2016-04-28 06:20:10 UTC (rev 200173)
</span><span class="lines">@@ -199,8 +199,9 @@
</span><span class="cx"> gtk_render_focus(m_context.get(), cr, rect.x(), rect.y(), rect.width(), rect.height());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderThemeBoxGadget::RenderThemeBoxGadget(const RenderThemeGadget::Info& info, const Vector<RenderThemeGadget::Info> children, RenderThemeGadget* parent)
</del><ins>+RenderThemeBoxGadget::RenderThemeBoxGadget(const RenderThemeGadget::Info& info, GtkOrientation orientation, const Vector<RenderThemeGadget::Info> children, RenderThemeGadget* parent)
</ins><span class="cx"> : RenderThemeGadget(info, parent, Vector<RenderThemeGadget::Info>(), 0)
</span><ins>+ , m_orientation(orientation)
</ins><span class="cx"> {
</span><span class="cx"> m_children.reserveCapacity(children.size());
</span><span class="cx"> unsigned index = 0;
</span><span class="lines">@@ -210,10 +211,21 @@
</span><span class="cx">
</span><span class="cx"> IntSize RenderThemeBoxGadget::preferredSize() const
</span><span class="cx"> {
</span><del>- IntSize minSize = RenderThemeGadget::preferredSize();
- for (const auto& child : m_children)
- minSize += child->preferredSize();
- return minSize;
</del><ins>+ IntSize childrenSize;
+ for (const auto& child : m_children) {
+ IntSize childSize = child->preferredSize();
+ switch (m_orientation) {
+ case GTK_ORIENTATION_HORIZONTAL:
+ childrenSize.setWidth(childrenSize.width() + childSize.width());
+ childrenSize.setHeight(std::max(childrenSize.height(), childSize.height()));
+ break;
+ case GTK_ORIENTATION_VERTICAL:
+ childrenSize.setWidth(std::max(childrenSize.width(), childSize.width()));
+ childrenSize.setHeight(childrenSize.height() + childSize.height());
+ break;
+ }
+ }
+ return RenderThemeGadget::preferredSize().expandedTo(childrenSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderThemeTextFieldGadget::RenderThemeTextFieldGadget(const RenderThemeGadget::Info& info, RenderThemeGadget* parent, const Vector<RenderThemeGadget::Info> siblings, unsigned position)
</span><span class="lines">@@ -348,6 +360,27 @@
</span><span class="cx"> m_steppers |= Steppers::SecondaryForward;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderThemeScrollbarGadget::renderStepper(cairo_t* cr, const FloatRect& paintRect, RenderThemeGadget* stepperGadget, GtkOrientation orientation, Steppers stepper)
+{
+ FloatRect contentsRect;
+ stepperGadget->render(cr, paintRect, &contentsRect);
+ double angle;
+ switch (stepper) {
+ case Steppers::Backward:
+ case Steppers::SecondaryBackward:
+ angle = orientation == GTK_ORIENTATION_VERTICAL ? 0 : 3 * (G_PI / 2);
+ break;
+ case Steppers::Forward:
+ case Steppers::SecondaryForward:
+ angle = orientation == GTK_ORIENTATION_VERTICAL ? G_PI / 2 : G_PI;
+ break;
+ }
+
+ int stepperSize = std::max(contentsRect.width(), contentsRect.height());
+ gtk_render_arrow(stepperGadget->context(), cr, angle, contentsRect.x() + (contentsRect.width() - stepperSize) / 2,
+ contentsRect.y() + (contentsRect.height() - stepperSize) / 2, stepperSize);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // GTK_CHECK_VERSION(3, 20, 0)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkRenderThemeGadgeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGadget.h (200172 => 200173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/RenderThemeGadget.h 2016-04-28 05:41:54 UTC (rev 200172)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGadget.h 2016-04-28 06:20:10 UTC (rev 200173)
</span><span class="lines">@@ -75,8 +75,9 @@
</span><span class="cx"> Color backgroundColor() const;
</span><span class="cx"> double opacity() const;
</span><span class="cx">
</span><ins>+ GtkStyleContext* context() const { return m_context.get(); }
+
</ins><span class="cx"> protected:
</span><del>- GtkStyleContext* context() const { return m_context.get(); }
</del><span class="cx"> GtkBorder marginBox() const;
</span><span class="cx"> GtkBorder borderBox() const;
</span><span class="cx"> GtkBorder paddingBox() const;
</span><span class="lines">@@ -86,7 +87,7 @@
</span><span class="cx">
</span><span class="cx"> class RenderThemeBoxGadget final : public RenderThemeGadget {
</span><span class="cx"> public:
</span><del>- RenderThemeBoxGadget(const RenderThemeGadget::Info&, const Vector<RenderThemeGadget::Info> children, RenderThemeGadget* parent = nullptr);
</del><ins>+ RenderThemeBoxGadget(const RenderThemeGadget::Info&, GtkOrientation, const Vector<RenderThemeGadget::Info> children, RenderThemeGadget* parent = nullptr);
</ins><span class="cx">
</span><span class="cx"> IntSize preferredSize() const override;
</span><span class="cx">
</span><span class="lines">@@ -94,6 +95,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Vector<std::unique_ptr<RenderThemeGadget>> m_children;
</span><ins>+ GtkOrientation m_orientation { GTK_ORIENTATION_HORIZONTAL };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class RenderThemeTextFieldGadget final : public RenderThemeGadget {
</span><span class="lines">@@ -159,6 +161,8 @@
</span><span class="cx"> };
</span><span class="cx"> OptionSet<Steppers> steppers() const { return m_steppers; };
</span><span class="cx">
</span><ins>+ void renderStepper(cairo_t*, const FloatRect&, RenderThemeGadget*, GtkOrientation, Steppers);
+
</ins><span class="cx"> private:
</span><span class="cx"> OptionSet<Steppers> m_steppers;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkScrollAnimatorGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/ScrollAnimatorGtk.cpp (200172 => 200173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/ScrollAnimatorGtk.cpp 2016-04-28 05:41:54 UTC (rev 200172)
+++ trunk/Source/WebCore/platform/gtk/ScrollAnimatorGtk.cpp 2016-04-28 06:20:10 UTC (rev 200173)
</span><span class="lines">@@ -153,13 +153,13 @@
</span><span class="cx"> if (m_verticalOverlayScrollbar && m_overlayScrollbarAnimationCurrent != m_verticalOverlayScrollbar->opacity()) {
</span><span class="cx"> m_verticalOverlayScrollbar->setOpacity(m_overlayScrollbarAnimationCurrent);
</span><span class="cx"> if (m_verticalOverlayScrollbar->hoveredPart() == NoPart)
</span><del>- ScrollbarTheme::theme().invalidatePart(*m_verticalOverlayScrollbar, ThumbPart);
</del><ins>+ m_verticalOverlayScrollbar->invalidate();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_horizontalOverlayScrollbar && m_overlayScrollbarAnimationCurrent != m_horizontalOverlayScrollbar->opacity()) {
</span><span class="cx"> m_horizontalOverlayScrollbar->setOpacity(m_overlayScrollbarAnimationCurrent);
</span><span class="cx"> if (m_horizontalOverlayScrollbar->hoveredPart() == NoPart)
</span><del>- ScrollbarTheme::theme().invalidatePart(*m_horizontalOverlayScrollbar, ThumbPart);
</del><ins>+ m_horizontalOverlayScrollbar->invalidate();
</ins><span class="cx"> }
</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 (200172 => 200173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp 2016-04-28 05:41:54 UTC (rev 200172)
+++ trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp 2016-04-28 06:20:10 UTC (rev 200173)
</span><span class="lines">@@ -129,6 +129,11 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // GTK_CHECK_VERSION(3, 20, 0)
</span><span class="cx">
</span><ins>+bool ScrollbarThemeGtk::hasButtons(Scrollbar& scrollbar)
+{
+ return scrollbar.enabled() && (m_hasBackButtonStartPart || m_hasForwardButtonEndPart || m_hasBackButtonEndPart || m_hasForwardButtonStartPart);
+}
+
</ins><span class="cx"> #if GTK_CHECK_VERSION(3, 20, 0)
</span><span class="cx"> static GtkStateFlags scrollbarPartStateFlags(Scrollbar& scrollbar, ScrollbarPart part, bool painting = false)
</span><span class="cx"> {
</span><span class="lines">@@ -185,7 +190,7 @@
</span><span class="cx"> return RenderThemeGadget::create(info);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static std::unique_ptr<RenderThemeBoxGadget> contentsGadgetForLayout(Scrollbar& scrollbar, RenderThemeGadget* parent, IntRect& contentsRect, Vector<int, 4> steppersPosition)
</del><ins>+static std::unique_ptr<RenderThemeBoxGadget> contentsGadgetForLayout(Scrollbar& scrollbar, RenderThemeGadget* parent, IntRect& contentsRect, Vector<int, 4>& steppersPosition)
</ins><span class="cx"> {
</span><span class="cx"> Vector<RenderThemeGadget::Info> children;
</span><span class="cx"> auto steppers = static_cast<RenderThemeScrollbarGadget*>(parent)->steppers();
</span><span class="lines">@@ -207,7 +212,8 @@
</span><span class="cx"> children.append({ RenderThemeGadget::Type::Generic, "button", scrollbarPartStateFlags(scrollbar, ForwardButtonEndPart), { "down" } });
</span><span class="cx"> }
</span><span class="cx"> RenderThemeGadget::Info info = { RenderThemeGadget::Type::Generic, "contents", GTK_STATE_FLAG_NORMAL, { } };
</span><del>- auto contentsGadget = std::make_unique<RenderThemeBoxGadget>(info, children, parent);
</del><ins>+ auto contentsGadget = std::make_unique<RenderThemeBoxGadget>(info, scrollbar.orientation() == VerticalScrollbar ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL,
+ children, parent);
</ins><span class="cx">
</span><span class="cx"> GtkBorder scrollbarContentsBox = parent->contentsBox();
</span><span class="cx"> GtkBorder contentsContentsBox = contentsGadget->contentsBox();
</span><span class="lines">@@ -230,16 +236,24 @@
</span><span class="cx"> auto contentsGadget = contentsGadgetForLayout(scrollbar, scrollbarGadget.get(), rect, steppersPosition);
</span><span class="cx">
</span><span class="cx"> if (steppersPosition[0] != -1) {
</span><del>- if (scrollbar.orientation() == VerticalScrollbar)
- rect.move(0, contentsGadget->child(steppersPosition[0])->preferredSize().height());
- else
- rect.move(contentsGadget->child(steppersPosition[0])->preferredSize().width(), 0);
</del><ins>+ IntSize stepperSize = contentsGadget->child(steppersPosition[0])->preferredSize();
+ if (scrollbar.orientation() == VerticalScrollbar) {
+ rect.move(0, stepperSize.height());
+ rect.contract(0, stepperSize.height());
+ } else {
+ rect.move(stepperSize.width(), 0);
+ rect.contract(stepperSize.width(), 0);
+ }
</ins><span class="cx"> }
</span><span class="cx"> if (steppersPosition[1] != -1) {
</span><del>- if (scrollbar.orientation() == VerticalScrollbar)
- rect.move(0, contentsGadget->child(steppersPosition[1])->preferredSize().height());
- else
- rect.move(contentsGadget->child(steppersPosition[1])->preferredSize().width(), 0);
</del><ins>+ IntSize stepperSize = contentsGadget->child(steppersPosition[1])->preferredSize();
+ if (scrollbar.orientation() == VerticalScrollbar) {
+ rect.move(0, stepperSize.height());
+ rect.contract(0, stepperSize.height());
+ } else {
+ rect.move(stepperSize.width(), 0);
+ rect.contract(stepperSize.width(), 0);
+ }
</ins><span class="cx"> }
</span><span class="cx"> if (steppersPosition[2] != -1) {
</span><span class="cx"> if (scrollbar.orientation() == VerticalScrollbar)
</span><span class="lines">@@ -327,18 +341,16 @@
</span><span class="cx">
</span><span class="cx"> // Secondary back.
</span><span class="cx"> if (steppersPosition[1] != -1) {
</span><del>- if (scrollbar.orientation() == VerticalScrollbar)
- rect.move(0, contentsGadget->child(steppersPosition[1])->preferredSize().height());
- else
- rect.move(contentsGadget->child(steppersPosition[1])->preferredSize().width(), 0);
</del><ins>+ IntSize preferredSize = contentsGadget->child(steppersPosition[1])->preferredSize();
+ if (scrollbar.orientation() == VerticalScrollbar) {
+ rect.move(0, preferredSize.height());
+ rect.contract(0, preferredSize.height());
+ } else {
+ rect.move(preferredSize.width(), 0);
+ rect.contract(0, preferredSize.width());
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- IntSize preferredSize = contentsGadget->child(steppersPosition[2])->preferredSize();
- if (scrollbar.orientation() == VerticalScrollbar)
- rect.contract(0, preferredSize.height());
- else
- rect.contract(preferredSize.width(), 0);
-
</del><span class="cx"> if (steppersPosition[3] != -1) {
</span><span class="cx"> if (scrollbar.orientation() == VerticalScrollbar)
</span><span class="cx"> rect.contract(0, contentsGadget->child(steppersPosition[3])->preferredSize().height());
</span><span class="lines">@@ -346,10 +358,11 @@
</span><span class="cx"> rect.contract(contentsGadget->child(steppersPosition[3])->preferredSize().width(), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ IntSize preferredSize = contentsGadget->child(steppersPosition[2])->preferredSize();
</ins><span class="cx"> if (scrollbar.orientation() == VerticalScrollbar)
</span><del>- rect.move(0, rect.height());
</del><ins>+ rect.move(0, rect.height() - preferredSize.height());
</ins><span class="cx"> else
</span><del>- rect.move(rect.width(), 0);
</del><ins>+ rect.move(rect.width() - preferredSize.width(), 0);
</ins><span class="cx">
</span><span class="cx"> return IntRect(rect.location(), preferredSize);
</span><span class="cx"> }
</span><span class="lines">@@ -366,15 +379,30 @@
</span><span class="cx"> auto contentsGadget = contentsGadgetForLayout(scrollbar, scrollbarGadget.get(), rect, steppersPosition);
</span><span class="cx">
</span><span class="cx"> if (steppersPosition[0] != -1) {
</span><del>- if (scrollbar.orientation() == VerticalScrollbar)
- rect.move(0, contentsGadget->child(steppersPosition[0])->preferredSize().height());
- else
- rect.move(contentsGadget->child(steppersPosition[0])->preferredSize().width(), 0);
</del><ins>+ IntSize preferredSize = contentsGadget->child(steppersPosition[0])->preferredSize();
+ if (scrollbar.orientation() == VerticalScrollbar) {
+ rect.move(0, preferredSize.height());
+ rect.contract(0, preferredSize.height());
+ } else {
+ rect.move(preferredSize.width(), 0);
+ rect.contract(preferredSize.width(), 0);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (part == ForwardButtonStartPart)
- return IntRect(rect.location(), contentsGadget->child(1)->preferredSize());
</del><ins>+ if (steppersPosition[1] != -1) {
+ IntSize preferredSize = contentsGadget->child(steppersPosition[1])->preferredSize();
+ if (part == ForwardButtonStartPart)
+ return IntRect(rect.location(), preferredSize);
</ins><span class="cx">
</span><ins>+ if (scrollbar.orientation() == VerticalScrollbar) {
+ rect.move(0, preferredSize.height());
+ rect.contract(0, preferredSize.height());
+ } else {
+ rect.move(preferredSize.width(), 0);
+ rect.contract(preferredSize.width(), 0);
+ }
+ }
+
</ins><span class="cx"> // Forward button.
</span><span class="cx"> IntSize preferredSize = contentsGadget->child(steppersPosition[3])->preferredSize();
</span><span class="cx"> if (scrollbar.orientation() == VerticalScrollbar)
</span><span class="lines">@@ -442,6 +470,9 @@
</span><span class="cx"> if (graphicsContext.paintingDisabled())
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (!scrollbar.enabled())
+ return true;
+
</ins><span class="cx"> double opacity = scrollbar.hoveredPart() == NoPart ? scrollbar.opacity() : 1;
</span><span class="cx"> if (!opacity)
</span><span class="cx"> return true;
</span><span class="lines">@@ -495,7 +526,8 @@
</span><span class="cx"> steppersPosition[3] = children.size();
</span><span class="cx"> children.append({ RenderThemeGadget::Type::Generic, "button", scrollbarPartStateFlags(scrollbar, ForwardButtonEndPart), { "down" } });
</span><span class="cx"> }
</span><del>- auto contentsGadget = std::make_unique<RenderThemeBoxGadget>(info, children, scrollbarGadget.get());
</del><ins>+ auto contentsGadget = std::make_unique<RenderThemeBoxGadget>(info, scrollbar.orientation() == VerticalScrollbar ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL,
+ children, scrollbarGadget.get());
</ins><span class="cx"> RenderThemeGadget* troughGadget = contentsGadget->child(troughPosition);
</span><span class="cx">
</span><span class="cx"> if (opacity != 1) {
</span><span class="lines">@@ -507,52 +539,79 @@
</span><span class="cx"> FloatRect contentsRect;
</span><span class="cx"> scrollbarGadget->render(graphicsContext.platformContext()->cr(), rect, &contentsRect);
</span><span class="cx"> contentsGadget->render(graphicsContext.platformContext()->cr(), contentsRect, &contentsRect);
</span><del>- troughGadget->render(graphicsContext.platformContext()->cr(), contentsRect, &contentsRect);
- FloatRect buttonRect = contentsRect;
</del><ins>+
</ins><span class="cx"> if (steppers.contains(RenderThemeScrollbarGadget::Steppers::Backward)) {
</span><span class="cx"> RenderThemeGadget* buttonGadget = contentsGadget->child(steppersPosition[0]);
</span><ins>+ FloatRect buttonRect = contentsRect;
</ins><span class="cx"> if (scrollbar.orientation() == VerticalScrollbar)
</span><span class="cx"> buttonRect.setHeight(buttonGadget->preferredSize().height());
</span><span class="cx"> else
</span><span class="cx"> buttonRect.setWidth(buttonGadget->preferredSize().width());
</span><del>- buttonGadget->render(graphicsContext.platformContext()->cr(), buttonRect);
- if (scrollbar.orientation() == VerticalScrollbar)
- buttonRect.move(0, buttonRect.height());
- else
- buttonRect.move(buttonRect.width(), 0);
</del><ins>+ static_cast<RenderThemeScrollbarGadget*>(scrollbarGadget.get())->renderStepper(graphicsContext.platformContext()->cr(), buttonRect, buttonGadget,
+ scrollbar.orientation() == VerticalScrollbar ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL, RenderThemeScrollbarGadget::Steppers::Backward);
+ if (scrollbar.orientation() == VerticalScrollbar) {
+ contentsRect.move(0, buttonRect.height());
+ contentsRect.contract(0, buttonRect.height());
+ } else {
+ contentsRect.move(buttonRect.width(), 0);
+ contentsRect.contract(buttonRect.width(), 0);
+ }
</ins><span class="cx"> }
</span><span class="cx"> if (steppers.contains(RenderThemeScrollbarGadget::Steppers::SecondaryForward)) {
</span><span class="cx"> RenderThemeGadget* buttonGadget = contentsGadget->child(steppersPosition[1]);
</span><ins>+ FloatRect buttonRect = contentsRect;
</ins><span class="cx"> if (scrollbar.orientation() == VerticalScrollbar)
</span><span class="cx"> buttonRect.setHeight(buttonGadget->preferredSize().height());
</span><span class="cx"> else
</span><span class="cx"> buttonRect.setWidth(buttonGadget->preferredSize().width());
</span><del>- buttonGadget->render(graphicsContext.platformContext()->cr(), buttonRect);
</del><ins>+ static_cast<RenderThemeScrollbarGadget*>(scrollbarGadget.get())->renderStepper(graphicsContext.platformContext()->cr(), buttonRect, buttonGadget,
+ scrollbar.orientation() == VerticalScrollbar ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL, RenderThemeScrollbarGadget::Steppers::SecondaryForward);
+ if (scrollbar.orientation() == VerticalScrollbar) {
+ contentsRect.move(0, buttonRect.height());
+ contentsRect.contract(0, buttonRect.height());
+ } else {
+ contentsRect.move(buttonRect.width(), 0);
+ contentsRect.contract(buttonRect.width(), 0);
+ }
+ }
+
+ if (steppers.contains(RenderThemeScrollbarGadget::Steppers::Forward)) {
+ RenderThemeGadget* buttonGadget = contentsGadget->child(steppersPosition[3]);
+ FloatRect buttonRect = contentsRect;
+ if (scrollbar.orientation() == VerticalScrollbar) {
+ buttonRect.setHeight(buttonGadget->preferredSize().height());
+ buttonRect.move(0, contentsRect.height() - buttonRect.height());
+ } else {
+ buttonRect.setWidth(buttonGadget->preferredSize().width());
+ buttonRect.move(contentsRect.width() - buttonRect.width(), 0);
+ }
+ static_cast<RenderThemeScrollbarGadget*>(scrollbarGadget.get())->renderStepper(graphicsContext.platformContext()->cr(), buttonRect, buttonGadget,
+ scrollbar.orientation() == VerticalScrollbar ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL, RenderThemeScrollbarGadget::Steppers::Forward);
</ins><span class="cx"> if (scrollbar.orientation() == VerticalScrollbar)
</span><del>- buttonRect.move(0, contentsRect.height());
</del><ins>+ contentsRect.contract(0, buttonRect.height());
</ins><span class="cx"> else
</span><del>- buttonRect.move(contentsRect.width(), 0);
</del><ins>+ contentsRect.contract(buttonRect.width(), 0);
</ins><span class="cx"> }
</span><span class="cx"> if (steppers.contains(RenderThemeScrollbarGadget::Steppers::SecondaryBackward)) {
</span><span class="cx"> RenderThemeGadget* buttonGadget = contentsGadget->child(steppersPosition[2]);
</span><del>- if (scrollbar.orientation() == VerticalScrollbar)
</del><ins>+ FloatRect buttonRect = contentsRect;
+ if (scrollbar.orientation() == VerticalScrollbar) {
</ins><span class="cx"> buttonRect.setHeight(buttonGadget->preferredSize().height());
</span><del>- else
</del><ins>+ buttonRect.move(0, contentsRect.height() - buttonRect.height());
+ } else {
</ins><span class="cx"> buttonRect.setWidth(buttonGadget->preferredSize().width());
</span><del>- buttonGadget->render(graphicsContext.platformContext()->cr(), buttonRect);
</del><ins>+ buttonRect.move(contentsRect.width() - buttonRect.width(), 0);
+ }
+ static_cast<RenderThemeScrollbarGadget*>(scrollbarGadget.get())->renderStepper(graphicsContext.platformContext()->cr(), buttonRect, buttonGadget,
+ scrollbar.orientation() == VerticalScrollbar ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL, RenderThemeScrollbarGadget::Steppers::SecondaryBackward);
</ins><span class="cx"> if (scrollbar.orientation() == VerticalScrollbar)
</span><del>- buttonRect.move(0, buttonRect.height());
</del><ins>+ contentsRect.contract(0, buttonRect.height());
</ins><span class="cx"> else
</span><del>- buttonRect.move(buttonRect.width(), 0);
</del><ins>+ contentsRect.contract(buttonRect.width(), 0);
</ins><span class="cx"> }
</span><del>- if (steppers.contains(RenderThemeScrollbarGadget::Steppers::Forward)) {
- RenderThemeGadget* buttonGadget = contentsGadget->child(steppersPosition[3]);
- if (scrollbar.orientation() == VerticalScrollbar)
- buttonRect.setHeight(buttonGadget->preferredSize().height());
- else
- buttonRect.setWidth(buttonGadget->preferredSize().width());
- buttonGadget->render(graphicsContext.platformContext()->cr(), buttonRect);
- }
</del><ins>+
+ troughGadget->render(graphicsContext.platformContext()->cr(), contentsRect, &contentsRect);
+
</ins><span class="cx"> if (int thumbSize = thumbLength(scrollbar)) {
</span><span class="cx"> info.name = "slider";
</span><span class="cx"> info.state = scrollbarPartStateFlags(scrollbar, ThumbPart);
</span><span class="lines">@@ -758,6 +817,11 @@
</span><span class="cx"> if (event.button() != RightButton)
</span><span class="cx"> return ScrollbarButtonPressAction::StartDrag;
</span><span class="cx"> break;
</span><ins>+ case BackButtonStartPart:
+ case ForwardButtonStartPart:
+ case BackButtonEndPart:
+ case ForwardButtonEndPart:
+ return ScrollbarButtonPressAction::Scroll;
</ins><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -788,12 +852,13 @@
</span><span class="cx"> children.append({ RenderThemeGadget::Type::Generic, "button", GTK_STATE_FLAG_NORMAL, { "up" } });
</span><span class="cx"> if (steppers.contains(RenderThemeScrollbarGadget::Steppers::Forward))
</span><span class="cx"> children.append({ RenderThemeGadget::Type::Generic, "button", GTK_STATE_FLAG_NORMAL, { "down" } });
</span><del>- auto contentsGadget = std::make_unique<RenderThemeBoxGadget>(info, children, scrollbarGadget.get());
</del><ins>+ auto contentsGadget = std::make_unique<RenderThemeBoxGadget>(info, GTK_ORIENTATION_VERTICAL, children, scrollbarGadget.get());
</ins><span class="cx"> info.name = "slider";
</span><span class="cx"> auto sliderGadget = RenderThemeGadget::create(info, contentsGadget->child(troughPositon));
</span><span class="cx"> IntSize preferredSize = scrollbarGadget->preferredSize();
</span><del>- preferredSize += contentsGadget->preferredSize();
- preferredSize += sliderGadget->preferredSize();
</del><ins>+ IntSize contentsPreferredSize = contentsGadget->preferredSize();
+ contentsPreferredSize = contentsPreferredSize.expandedTo(sliderGadget->preferredSize());
+ preferredSize += contentsPreferredSize;
</ins><span class="cx">
</span><span class="cx"> return preferredSize.width();
</span><span class="cx"> }
</span><span class="lines">@@ -818,7 +883,7 @@
</span><span class="cx"> info.state = GTK_STATE_FLAG_NORMAL;
</span><span class="cx"> info.classList.clear();
</span><span class="cx"> Vector<RenderThemeGadget::Info> children = {{ RenderThemeGadget::Type::Generic, "trough", GTK_STATE_FLAG_PRELIGHT, { } } };
</span><del>- auto contentsGadget = std::make_unique<RenderThemeBoxGadget>(info, children, scrollbarGadget.get());
</del><ins>+ auto contentsGadget = std::make_unique<RenderThemeBoxGadget>(info, GTK_ORIENTATION_VERTICAL, children, scrollbarGadget.get());
</ins><span class="cx"> info.name = "slider";
</span><span class="cx"> IntSize minSize = RenderThemeGadget::create(info, contentsGadget->child(0))->minimumSize();
</span><span class="cx"> return scrollbar.orientation() == VerticalScrollbar ? minSize.height() : minSize.width();
</span><span class="lines">@@ -852,6 +917,11 @@
</span><span class="cx"> {
</span><span class="cx"> return IntRect();
</span><span class="cx"> }
</span><ins>+
+bool ScrollbarThemeGtk::hasButtons(Scrollbar&)
+{
+ return false;
+}
</ins><span class="cx"> #endif // GTK_API_VERSION_2
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkScrollbarThemeGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.h (200172 => 200173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.h 2016-04-28 05:41:54 UTC (rev 200172)
+++ trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.h 2016-04-28 06:20:10 UTC (rev 200173)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~ScrollbarThemeGtk();
</span><span class="cx">
</span><del>- bool hasButtons(Scrollbar&) override { return true; }
</del><ins>+ bool hasButtons(Scrollbar&) override;
</ins><span class="cx"> bool hasThumb(Scrollbar&) override;
</span><span class="cx"> IntRect backButtonRect(Scrollbar&, ScrollbarPart, bool) override;
</span><span class="cx"> IntRect forwardButtonRect(Scrollbar&, ScrollbarPart, bool) override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.cpp (200172 => 200173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2016-04-28 05:41:54 UTC (rev 200172)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2016-04-28 06:20:10 UTC (rev 200173)
</span><span class="lines">@@ -783,7 +783,7 @@
</span><span class="cx"> };
</span><span class="cx"> info.name = "box";
</span><span class="cx"> info.classList = { "horizontal", "linked" };
</span><del>- return RenderThemeBoxGadget(info, children, comboGadget.get()).child(0)->color();
</del><ins>+ return RenderThemeBoxGadget(info, GTK_ORIENTATION_HORIZONTAL, children, comboGadget.get()).child(0)->color();
</ins><span class="cx"> #else
</span><span class="cx"> GRefPtr<GtkStyleContext> parentStyleContext = createStyleContext(ComboBox);
</span><span class="cx"> GRefPtr<GtkStyleContext> buttonStyleContext = createStyleContext(ComboBoxButton, parentStyleContext.get());
</span><span class="lines">@@ -835,7 +835,7 @@
</span><span class="cx"> };
</span><span class="cx"> info.name = "box";
</span><span class="cx"> info.classList = { "horizontal", "linked" };
</span><del>- auto boxGadget = std::make_unique<RenderThemeBoxGadget>(info, children, comboGadget.get());
</del><ins>+ auto boxGadget = std::make_unique<RenderThemeBoxGadget>(info, GTK_ORIENTATION_HORIZONTAL, children, comboGadget.get());
</ins><span class="cx"> RenderThemeGadget* buttonGadget = boxGadget->child(0);
</span><span class="cx"> info.classList.removeLast();
</span><span class="cx"> auto buttonBoxGadget = RenderThemeGadget::create(info, buttonGadget);
</span><span class="lines">@@ -866,7 +866,7 @@
</span><span class="cx"> };
</span><span class="cx"> info.name = "box";
</span><span class="cx"> info.classList = { "horizontal", "linked" };
</span><del>- auto boxGadget = std::make_unique<RenderThemeBoxGadget>(info, children, comboGadget.get());
</del><ins>+ auto boxGadget = std::make_unique<RenderThemeBoxGadget>(info, GTK_ORIENTATION_HORIZONTAL, children, comboGadget.get());
</ins><span class="cx"> RenderThemeGadget* buttonGadget = boxGadget->child(0);
</span><span class="cx"> info.classList.removeLast();
</span><span class="cx"> auto buttonBoxGadget = RenderThemeGadget::create(info, buttonGadget);
</span></span></pre>
</div>
</div>
</body>
</html>