<!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>[203294] 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/203294">203294</a></dd>
<dt>Author</dt> <dd>tonikitoo@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-15 13:19:29 -0700 (Fri, 15 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ScrollView::setHasHorizontalScrollbar / setHasVerticalScrollbar duplicate their logic
https://bugs.webkit.org/show_bug.cgi?id=159825
Patch introduces a (private) method to ScrollView
to share the code/logic of setHas{Horizontal,Vertical}Scrollbar.
Patch by Antonio Gomes <tonikitoo@igalia.com> on 2016-07-15
Reviewed by Simon Fraser.
No new tests needed.
* platform/ScrollView.cpp:
(WebCore::ScrollView::setHasScrollbarInternal):
(WebCore::ScrollView::setHasHorizontalScrollbar):
(WebCore::ScrollView::setHasVerticalScrollbar):
* platform/ScrollView.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollViewcpp">trunk/Source/WebCore/platform/ScrollView.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollViewh">trunk/Source/WebCore/platform/ScrollView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203293 => 203294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-07-15 20:03:39 UTC (rev 203293)
+++ trunk/Source/WebCore/ChangeLog        2016-07-15 20:19:29 UTC (rev 203294)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-07-15 Antonio Gomes <tonikitoo@igalia.com>
+
+ ScrollView::setHasHorizontalScrollbar / setHasVerticalScrollbar duplicate their logic
+ https://bugs.webkit.org/show_bug.cgi?id=159825
+
+ Patch introduces a (private) method to ScrollView
+ to share the code/logic of setHas{Horizontal,Vertical}Scrollbar.
+
+ Reviewed by Simon Fraser.
+
+ No new tests needed.
+
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::setHasScrollbarInternal):
+ (WebCore::ScrollView::setHasHorizontalScrollbar):
+ (WebCore::ScrollView::setHasVerticalScrollbar):
+ * platform/ScrollView.h:
+
</ins><span class="cx"> 2016-07-15 Frederic Wang <fwang@igalia.com>
</span><span class="cx">
</span><span class="cx"> MathOperator: Improve alignment for vertical size variant
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.cpp (203293 => 203294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.cpp        2016-07-15 20:03:39 UTC (rev 203293)
+++ trunk/Source/WebCore/platform/ScrollView.cpp        2016-07-15 20:19:29 UTC (rev 203294)
</span><span class="lines">@@ -83,48 +83,33 @@
</span><span class="cx">
</span><span class="cx"> bool ScrollView::setHasHorizontalScrollbar(bool hasBar, bool* contentSizeAffected)
</span><span class="cx"> {
</span><del>- ASSERT(!hasBar || !avoidScrollbarCreation());
- if (hasBar && !m_horizontalScrollbar) {
- m_horizontalScrollbar = createScrollbar(HorizontalScrollbar);
- addChild(m_horizontalScrollbar.get());
- didAddScrollbar(m_horizontalScrollbar.get(), HorizontalScrollbar);
- m_horizontalScrollbar->styleChanged();
- if (contentSizeAffected)
- *contentSizeAffected = !m_horizontalScrollbar->isOverlayScrollbar();
- return true;
- }
-
- if (!hasBar && m_horizontalScrollbar) {
- bool wasOverlayScrollbar = m_horizontalScrollbar->isOverlayScrollbar();
- willRemoveScrollbar(m_horizontalScrollbar.get(), HorizontalScrollbar);
- removeChild(*m_horizontalScrollbar);
- m_horizontalScrollbar = nullptr;
- if (contentSizeAffected)
- *contentSizeAffected = !wasOverlayScrollbar;
- return true;
- }
-
- return false;
</del><ins>+ return setHasScrollbarInternal(m_horizontalScrollbar, HorizontalScrollbar, hasBar, contentSizeAffected);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ScrollView::setHasVerticalScrollbar(bool hasBar, bool* contentSizeAffected)
</span><span class="cx"> {
</span><ins>+ return setHasScrollbarInternal(m_verticalScrollbar, VerticalScrollbar, hasBar, contentSizeAffected);
+}
+
+bool ScrollView::setHasScrollbarInternal(RefPtr<Scrollbar>& scrollbar, ScrollbarOrientation orientation, bool hasBar, bool* contentSizeAffected)
+{
</ins><span class="cx"> ASSERT(!hasBar || !avoidScrollbarCreation());
</span><del>- if (hasBar && !m_verticalScrollbar) {
- m_verticalScrollbar = createScrollbar(VerticalScrollbar);
- addChild(m_verticalScrollbar.get());
- didAddScrollbar(m_verticalScrollbar.get(), VerticalScrollbar);
- m_verticalScrollbar->styleChanged();
</del><ins>+
+ if (hasBar && !scrollbar) {
+ scrollbar = createScrollbar(orientation);
+ addChild(scrollbar.get());
+ didAddScrollbar(scrollbar.get(), orientation);
+ scrollbar->styleChanged();
</ins><span class="cx"> if (contentSizeAffected)
</span><del>- *contentSizeAffected = !m_verticalScrollbar->isOverlayScrollbar();
</del><ins>+ *contentSizeAffected = !scrollbar->isOverlayScrollbar();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!hasBar && m_verticalScrollbar) {
- bool wasOverlayScrollbar = m_verticalScrollbar->isOverlayScrollbar();
- willRemoveScrollbar(m_verticalScrollbar.get(), VerticalScrollbar);
- removeChild(*m_verticalScrollbar);
- m_verticalScrollbar = nullptr;
</del><ins>+ if (!hasBar && scrollbar) {
+ bool wasOverlayScrollbar = scrollbar->isOverlayScrollbar();
+ willRemoveScrollbar(scrollbar.get(), orientation);
+ removeChild(*scrollbar);
+ scrollbar = nullptr;
</ins><span class="cx"> if (contentSizeAffected)
</span><span class="cx"> *contentSizeAffected = !wasOverlayScrollbar;
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.h (203293 => 203294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.h        2016-07-15 20:03:39 UTC (rev 203293)
+++ trunk/Source/WebCore/platform/ScrollView.h        2016-07-15 20:19:29 UTC (rev 203294)
</span><span class="lines">@@ -431,6 +431,8 @@
</span><span class="cx">
</span><span class="cx"> void completeUpdatesAfterScrollTo(const IntSize& scrollDelta);
</span><span class="cx">
</span><ins>+ bool setHasScrollbarInternal(RefPtr<Scrollbar>&, ScrollbarOrientation, bool hasBar, bool* contentSizeAffected);
+
</ins><span class="cx"> RefPtr<Scrollbar> m_horizontalScrollbar;
</span><span class="cx"> RefPtr<Scrollbar> m_verticalScrollbar;
</span><span class="cx"> ScrollbarMode m_horizontalScrollbarMode;
</span></span></pre>
</div>
</div>
</body>
</html>