<!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>[246934] 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/246934">246934</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2019-06-28 13:23:12 -0700 (Fri, 28 Jun 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/239984">r239984</a>): pages with custom scrollbars also show normal scrollbars
https://bugs.webkit.org/show_bug.cgi?id=199321
<rdar://problem/52308095>

Reviewed by Timothy Hatcher.

Revert the part of <a href="http://trac.webkit.org/projects/webkit/changeset/239984">r239984</a> that made isCustomScrollbar() virtual, since theme().registerScrollbar()
calls it from the base class constructor.

I wasn't able to make a test that tests rendering of overlay scrollbars (webkit.org/b/199323).

* platform/Scrollbar.cpp:
(WebCore::Scrollbar::Scrollbar):
* platform/Scrollbar.h:
(WebCore::Scrollbar::isCustomScrollbar const):
* rendering/RenderScrollbar.cpp:
(WebCore::RenderScrollbar::RenderScrollbar):
* rendering/RenderScrollbar.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollbarcpp">trunk/Source/WebCore/platform/Scrollbar.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollbarh">trunk/Source/WebCore/platform/Scrollbar.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderScrollbarcpp">trunk/Source/WebCore/rendering/RenderScrollbar.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderScrollbarh">trunk/Source/WebCore/rendering/RenderScrollbar.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (246933 => 246934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-06-28 20:15:33 UTC (rev 246933)
+++ trunk/Source/WebCore/ChangeLog      2019-06-28 20:23:12 UTC (rev 246934)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2019-06-28  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (r239984): pages with custom scrollbars also show normal scrollbars
+        https://bugs.webkit.org/show_bug.cgi?id=199321
+        <rdar://problem/52308095>
+
+        Reviewed by Timothy Hatcher.
+
+        Revert the part of r239984 that made isCustomScrollbar() virtual, since theme().registerScrollbar()
+        calls it from the base class constructor.
+
+        I wasn't able to make a test that tests rendering of overlay scrollbars (webkit.org/b/199323).
+
+        * platform/Scrollbar.cpp:
+        (WebCore::Scrollbar::Scrollbar):
+        * platform/Scrollbar.h:
+        (WebCore::Scrollbar::isCustomScrollbar const):
+        * rendering/RenderScrollbar.cpp:
+        (WebCore::RenderScrollbar::RenderScrollbar):
+        * rendering/RenderScrollbar.h:
+
</ins><span class="cx"> 2019-06-28  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Need a way for SPI clients to know when to avoid resizing to accommodate for the input view bounds
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Scrollbar.cpp (246933 => 246934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Scrollbar.cpp      2019-06-28 20:15:33 UTC (rev 246933)
+++ trunk/Source/WebCore/platform/Scrollbar.cpp 2019-06-28 20:23:12 UTC (rev 246934)
</span><span class="lines">@@ -54,11 +54,12 @@
</span><span class="cx">     return maxOverlapBetweenPages;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-Scrollbar::Scrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, ScrollbarControlSize controlSize, ScrollbarTheme* customTheme)
</del><ins>+Scrollbar::Scrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, ScrollbarControlSize controlSize, ScrollbarTheme* customTheme, bool isCustomScrollbar)
</ins><span class="cx">     : m_scrollableArea(scrollableArea)
</span><span class="cx">     , m_orientation(orientation)
</span><span class="cx">     , m_controlSize(controlSize)
</span><span class="cx">     , m_theme(customTheme ? *customTheme : ScrollbarTheme::theme())
</span><ins>+    , m_isCustomScrollbar(isCustomScrollbar)
</ins><span class="cx">     , m_scrollTimer(*this, &Scrollbar::autoscrollTimerFired)
</span><span class="cx"> {
</span><span class="cx">     theme().registerScrollbar(*this);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollbarh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Scrollbar.h (246933 => 246934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Scrollbar.h        2019-06-28 20:15:33 UTC (rev 246933)
+++ trunk/Source/WebCore/platform/Scrollbar.h   2019-06-28 20:23:12 UTC (rev 246934)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> 
</span><span class="cx">     ScrollableArea& scrollableArea() const { return m_scrollableArea; }
</span><span class="cx"> 
</span><del>-    virtual bool isCustomScrollbar() const { return false; }
</del><ins>+    bool isCustomScrollbar() const { return m_isCustomScrollbar; }
</ins><span class="cx">     ScrollbarOrientation orientation() const { return m_orientation; }
</span><span class="cx"> 
</span><span class="cx">     int value() const { return lroundf(m_currentPos); }
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx">     bool supportsUpdateOnSecondaryThread() const;
</span><span class="cx"> 
</span><span class="cx"> protected:
</span><del>-    Scrollbar(ScrollableArea&, ScrollbarOrientation, ScrollbarControlSize, ScrollbarTheme* = nullptr);
</del><ins>+    Scrollbar(ScrollableArea&, ScrollbarOrientation, ScrollbarControlSize, ScrollbarTheme* = nullptr, bool isCustomScrollbar = false);
</ins><span class="cx"> 
</span><span class="cx">     void updateThumb();
</span><span class="cx">     virtual void updateThumbPosition();
</span><span class="lines">@@ -165,6 +165,7 @@
</span><span class="cx">     int m_documentDragPos { 0 };
</span><span class="cx"> 
</span><span class="cx">     bool m_enabled { true };
</span><ins>+    bool m_isCustomScrollbar { false };
</ins><span class="cx"> 
</span><span class="cx">     Timer m_scrollTimer;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderScrollbar.cpp (246933 => 246934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderScrollbar.cpp       2019-06-28 20:15:33 UTC (rev 246933)
+++ trunk/Source/WebCore/rendering/RenderScrollbar.cpp  2019-06-28 20:23:12 UTC (rev 246934)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> RenderScrollbar::RenderScrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, Element* ownerElement, Frame* owningFrame)
</span><del>-    : Scrollbar(scrollableArea, orientation, RegularScrollbar, RenderScrollbarTheme::renderScrollbarTheme())
</del><ins>+    : Scrollbar(scrollableArea, orientation, RegularScrollbar, RenderScrollbarTheme::renderScrollbarTheme(), true)
</ins><span class="cx">     , m_ownerElement(ownerElement)
</span><span class="cx">     , m_owningFrame(owningFrame)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderScrollbarh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderScrollbar.h (246933 => 246934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderScrollbar.h 2019-06-28 20:15:33 UTC (rev 246933)
+++ trunk/Source/WebCore/rendering/RenderScrollbar.h    2019-06-28 20:23:12 UTC (rev 246934)
</span><span class="lines">@@ -61,7 +61,6 @@
</span><span class="cx"> private:
</span><span class="cx">     RenderScrollbar(ScrollableArea&, ScrollbarOrientation, Element*, Frame*);
</span><span class="cx"> 
</span><del>-    bool isCustomScrollbar() const override { return true; }
</del><span class="cx">     bool isOverlayScrollbar() const override { return false; }
</span><span class="cx"> 
</span><span class="cx">     void setParent(ScrollView*) override;
</span></span></pre>
</div>
</div>

</body>
</html>