Changeset 246934 in webkit

Timestamp:

Jun 28, 2019 1:23:12 PM (5 years ago)

Author:

Simon Fraser

Message:

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/Scrollbar.cpp (modified) (1 diff)
• platform/Scrollbar.h (modified) (3 diffs)
• rendering/RenderScrollbar.cpp (modified) (1 diff)
• rendering/RenderScrollbar.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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:
+
 2019-06-28  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/platform/Scrollbar.cpp

@@ -55 +55 @@
 }
 
-Scrollbar::Scrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, ScrollbarControlSize controlSize, ScrollbarTheme* customTheme)
+Scrollbar::Scrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, ScrollbarControlSize controlSize, ScrollbarTheme* customTheme, bool isCustomScrollbar)
     : m_scrollableArea(scrollableArea)
     , m_orientation(orientation)
     , m_controlSize(controlSize)
     , m_theme(customTheme ? *customTheme : ScrollbarTheme::theme())
+    , m_isCustomScrollbar(isCustomScrollbar)
     , m_scrollTimer(*this, &Scrollbar::autoscrollTimerFired)
 {

trunk/Source/WebCore/platform/Scrollbar.h

@@ -57 +57 @@
     ScrollableArea& scrollableArea() const { return m_scrollableArea; }
 
-    virtual bool isCustomScrollbar() const { return false; }
+    bool isCustomScrollbar() const { return m_isCustomScrollbar; }
     ScrollbarOrientation orientation() const { return m_orientation; }
 
@@ -133 +133 @@
 
 protected:
-    Scrollbar(ScrollableArea&, ScrollbarOrientation, ScrollbarControlSize, ScrollbarTheme* = nullptr);
+    Scrollbar(ScrollableArea&, ScrollbarOrientation, ScrollbarControlSize, ScrollbarTheme* = nullptr, bool isCustomScrollbar = false);
 
     void updateThumb();
@@ -166 +166 @@
 
     bool m_enabled { true };
+    bool m_isCustomScrollbar { false };
 
     Timer m_scrollTimer;

trunk/Source/WebCore/rendering/RenderScrollbar.cpp

@@ -43 +43 @@
 
 RenderScrollbar::RenderScrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, Element* ownerElement, Frame* owningFrame)
-    : Scrollbar(scrollableArea, orientation, RegularScrollbar, RenderScrollbarTheme::renderScrollbarTheme())
+    : Scrollbar(scrollableArea, orientation, RegularScrollbar, RenderScrollbarTheme::renderScrollbarTheme(), true)
     , m_ownerElement(ownerElement)
     , m_owningFrame(owningFrame)

trunk/Source/WebCore/rendering/RenderScrollbar.h

@@ -62 +62 @@
     RenderScrollbar(ScrollableArea&, ScrollbarOrientation, Element*, Frame*);
 
-    bool isCustomScrollbar() const override { return true; }
     bool isOverlayScrollbar() const override { return false; }