Attachment 373129 Details for Bug 199325 – Patch

[patch] Patch

bug-199325-20190628103332.patch (text/plain), 23.11 KB, created by Simon Fraser (smfr) on 2019-06-28 10:33:33 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2019-06-28 10:33:33 PDT

Size: 23.11 KB

patch

obsolete

>Subversion Revision: 246919
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index ada73a714a7c2527b35802a4c02c47a5bdccb4d5..b2e00e6ce8d9f65cd342306bbfbb7b6b91cd7b5b 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,49 @@
>+2019-06-28  Simon Fraser  <simon.fraser@apple.com>
>+
>+        Make ScrollbarControlSize an enum class
>+        https://bugs.webkit.org/show_bug.cgi?id=199325
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Make ScrollbarControlSize an enum class, and make some RenderScrollbar methods const.
>+
>+        * platform/ScrollTypes.h:
>+        * platform/ScrollView.cpp:
>+        (WebCore::ScrollView::createScrollbar):
>+        * platform/ScrollbarTheme.h:
>+        (WebCore::ScrollbarTheme::scrollbarThickness):
>+        * platform/ios/ScrollbarThemeIOS.h:
>+        * platform/mac/ScrollbarThemeMac.h:
>+        * platform/mac/ScrollbarThemeMac.mm:
>+        (WebCore::scrollbarControlSizeToNSControlSize):
>+        (WebCore::scrollbarSizeToIndex):
>+        (WebCore::ScrollbarThemeMac::hasButtons):
>+        (WebCore::buttonRepaintRect):
>+        (WebCore::ScrollbarThemeMac::backButtonRect):
>+        (WebCore::ScrollbarThemeMac::forwardButtonRect):
>+        (WebCore::ScrollbarThemeMac::trackRect):
>+        * platform/mock/ScrollbarThemeMock.h:
>+        * platform/playstation/ScrollbarThemePlayStation.h:
>+        * platform/win/ScrollbarThemeWin.h:
>+        * rendering/RenderLayer.cpp:
>+        (WebCore::RenderLayer::createScrollbar):
>+        * rendering/RenderScrollbar.cpp:
>+        (WebCore::RenderScrollbar::RenderScrollbar):
>+        (WebCore::RenderScrollbar::buttonRect const):
>+        (WebCore::RenderScrollbar::trackRect const):
>+        (WebCore::RenderScrollbar::trackPieceRectWithMargins const):
>+        (WebCore::RenderScrollbar::minimumThumbLength const):
>+        (WebCore::RenderScrollbar::opacity const):
>+        (WebCore::RenderScrollbar::buttonRect): Deleted.
>+        (WebCore::RenderScrollbar::trackRect): Deleted.
>+        (WebCore::RenderScrollbar::trackPieceRectWithMargins): Deleted.
>+        (WebCore::RenderScrollbar::minimumThumbLength): Deleted.
>+        (WebCore::RenderScrollbar::opacity): Deleted.
>+        * rendering/RenderScrollbar.h:
>+        * rendering/RenderTheme.h:
>+        (WebCore::RenderTheme::scrollbarControlSizeForPart):
>+        * rendering/RenderThemeMac.h:
>+
> 2019-06-27  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         [WinCairo][MediaFoundation] Stop using soft linking for Media Foundation
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 13dbd76f3b1239e21e2a9cb51f6a61323d21d5b2..9355093758c5c4408abbf56757bddad6b0ff7111 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-06-28  Simon Fraser  <simon.fraser@apple.com>
>+
>+        Make ScrollbarControlSize an enum class
>+        https://bugs.webkit.org/show_bug.cgi?id=199325
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Make ScrollbarControlSize an enum class, and make some RenderScrollbar methods const.
>+
>+        * WebProcess/Plugins/PDF/PDFPlugin.mm:
>+        (WebKit::PDFPlugin::createScrollbar):
>+
> 2019-06-27  Dean Jackson  <dino@apple.com>
> 
>         Provide overrides for UIKit's suggested actions in UIContextMenuInteraction
>diff --git a/Source/WebCore/platform/ScrollTypes.h b/Source/WebCore/platform/ScrollTypes.h
>index 891149103d36ce3aa634450128bc89c4402fba8c..03cf42779109ff179ac7bcb91ad3422c3cfb2280 100644
>--- a/Source/WebCore/platform/ScrollTypes.h
>+++ b/Source/WebCore/platform/ScrollTypes.h
>@@ -136,9 +136,9 @@ enum ScrollbarMode : uint8_t {
>     ScrollbarAlwaysOn
> };
> 
>-enum ScrollbarControlSize : uint8_t {
>-    RegularScrollbar,
>-    SmallScrollbar
>+enum class ScrollbarControlSize : uint8_t {
>+    Regular,
>+    Small
> };
> 
> enum class ScrollbarExpansionState : uint8_t {
>diff --git a/Source/WebCore/platform/ScrollView.cpp b/Source/WebCore/platform/ScrollView.cpp
>index b126a9c2b706a117346c57407851e385582cc968..ecef773e9cc6e8bb0bb1b74c95e4096b79fd3d8e 100644
>--- a/Source/WebCore/platform/ScrollView.cpp
>+++ b/Source/WebCore/platform/ScrollView.cpp
>@@ -102,7 +102,7 @@ bool ScrollView::setHasScrollbarInternal(RefPtr<Scrollbar>& scrollbar, Scrollbar
> 
> Ref<Scrollbar> ScrollView::createScrollbar(ScrollbarOrientation orientation)
> {
>-    return Scrollbar::createNativeScrollbar(*this, orientation, RegularScrollbar);
>+    return Scrollbar::createNativeScrollbar(*this, orientation, ScrollbarControlSize::Regular);
> }
> 
> void ScrollView::setScrollbarModes(ScrollbarMode horizontalMode, ScrollbarMode verticalMode,
>diff --git a/Source/WebCore/platform/ScrollbarTheme.h b/Source/WebCore/platform/ScrollbarTheme.h
>index b291d7a0d49538aa8dafc1f535429a177bffaf41..5c16f9a1893f5182e77aa16d4bcabbc9b4279199 100644
>--- a/Source/WebCore/platform/ScrollbarTheme.h
>+++ b/Source/WebCore/platform/ScrollbarTheme.h
>@@ -51,7 +51,7 @@ public:
>     virtual bool paint(Scrollbar&, GraphicsContext&, const IntRect& /*damageRect*/) { return false; }
>     virtual ScrollbarPart hitTest(Scrollbar&, const IntPoint&) { return NoPart; }
>     
>-    virtual int scrollbarThickness(ScrollbarControlSize = RegularScrollbar, ScrollbarExpansionState = ScrollbarExpansionState::Expanded) { return 0; }
>+    virtual int scrollbarThickness(ScrollbarControlSize = ScrollbarControlSize::Regular, ScrollbarExpansionState = ScrollbarExpansionState::Expanded) { return 0; }
> 
>     virtual ScrollbarButtonsPlacement buttonsPlacement() const { return ScrollbarButtonsSingle; }
> 
>diff --git a/Source/WebCore/platform/ios/ScrollbarThemeIOS.h b/Source/WebCore/platform/ios/ScrollbarThemeIOS.h
>index 3b2a90810f7fa633186142328ebd8290ccfd5866..78c3fad4717d8383e8ac834929acb9161068fcbf 100644
>--- a/Source/WebCore/platform/ios/ScrollbarThemeIOS.h
>+++ b/Source/WebCore/platform/ios/ScrollbarThemeIOS.h
>@@ -38,7 +38,7 @@ public:
> 
>     bool paint(Scrollbar&, GraphicsContext&, const IntRect& damageRect) override;
> 
>-    int scrollbarThickness(ScrollbarControlSize = RegularScrollbar, ScrollbarExpansionState = ScrollbarExpansionState::Expanded) override;
>+    int scrollbarThickness(ScrollbarControlSize = ScrollbarControlSize::Regular, ScrollbarExpansionState = ScrollbarExpansionState::Expanded) override;
>     
>     bool supportsControlTints() const override { return true; }
> 
>diff --git a/Source/WebCore/platform/mac/ScrollbarThemeMac.h b/Source/WebCore/platform/mac/ScrollbarThemeMac.h
>index cf0eeaf2a13f7cad8dd2770e76405f0bc17b5655..e084b9cc1afad967f15137c8993c7b6450c19cb8 100644
>--- a/Source/WebCore/platform/mac/ScrollbarThemeMac.h
>+++ b/Source/WebCore/platform/mac/ScrollbarThemeMac.h
>@@ -45,7 +45,7 @@ public:
>     bool paint(Scrollbar&, GraphicsContext&, const IntRect& damageRect) override;
>     void paintScrollCorner(GraphicsContext&, const IntRect& cornerRect) override;
> 
>-    int scrollbarThickness(ScrollbarControlSize = RegularScrollbar, ScrollbarExpansionState = ScrollbarExpansionState::Expanded) override;
>+    int scrollbarThickness(ScrollbarControlSize = ScrollbarControlSize::Regular, ScrollbarExpansionState = ScrollbarExpansionState::Expanded) override;
>     
>     bool supportsControlTints() const override { return true; }
>     bool usesOverlayScrollbars() const  override;
>diff --git a/Source/WebCore/platform/mac/ScrollbarThemeMac.mm b/Source/WebCore/platform/mac/ScrollbarThemeMac.mm
>index 35a141a7e76b838747e7779c9a4ee7c7ef0b4cd3..2ae86625a532245cf05ac79cd09b50a5d59a35b0 100644
>--- a/Source/WebCore/platform/mac/ScrollbarThemeMac.mm
>+++ b/Source/WebCore/platform/mac/ScrollbarThemeMac.mm
>@@ -144,9 +144,9 @@ static ScrollbarButtonsPlacement gButtonPlacement = ScrollbarButtonsDoubleEnd;
> static NSControlSize scrollbarControlSizeToNSControlSize(ScrollbarControlSize controlSize)
> {
>     switch (controlSize) {
>-    case RegularScrollbar:
>+    case ScrollbarControlSize::Regular:
>         return NSControlSizeRegular;
>-    case SmallScrollbar:
>+    case ScrollbarControlSize::Small:
>         return NSControlSizeSmall;
>     }
> 
>@@ -284,12 +284,21 @@ ScrollbarButtonsPlacement ScrollbarThemeMac::buttonsPlacement() const
>     return gButtonPlacement;
> }
> 
>+inline constexpr unsigned scrollbarSizeToIndex(ScrollbarControlSize scrollbarSize)
>+{
>+    switch (scrollbarSize) {
>+    case ScrollbarControlSize::Regular: return 0;
>+    case ScrollbarControlSize::Small: return 1;
>+    }
>+    return 0;
>+}
>+
> bool ScrollbarThemeMac::hasButtons(Scrollbar& scrollbar)
> {
>     return scrollbar.enabled() && buttonsPlacement() != ScrollbarButtonsNone
>              && (scrollbar.orientation() == HorizontalScrollbar
>              ? scrollbar.width()
>-             : scrollbar.height()) >= 2 * (cRealButtonLength[scrollbar.controlSize()] - cButtonHitInset[scrollbar.controlSize()]);
>+             : scrollbar.height()) >= 2 * (cRealButtonLength[scrollbarSizeToIndex(scrollbar.controlSize())] - cButtonHitInset[scrollbarSizeToIndex(scrollbar.controlSize())]);
> }
> 
> bool ScrollbarThemeMac::hasThumb(Scrollbar& scrollbar)
>@@ -311,13 +320,13 @@ static IntRect buttonRepaintRect(const IntRect& buttonRect, ScrollbarOrientation
> 
>     IntRect paintRect(buttonRect);
>     if (orientation == HorizontalScrollbar) {
>-        paintRect.setWidth(cRealButtonLength[controlSize]);
>+        paintRect.setWidth(cRealButtonLength[scrollbarSizeToIndex(controlSize)]);
>         if (!start)
>-            paintRect.setX(buttonRect.x() - (cRealButtonLength[controlSize] - buttonRect.width()));
>+            paintRect.setX(buttonRect.x() - (cRealButtonLength[scrollbarSizeToIndex(controlSize)] - buttonRect.width()));
>     } else {
>-        paintRect.setHeight(cRealButtonLength[controlSize]);
>+        paintRect.setHeight(cRealButtonLength[scrollbarSizeToIndex(controlSize)]);
>         if (!start)
>-            paintRect.setY(buttonRect.y() - (cRealButtonLength[controlSize] - buttonRect.height()));
>+            paintRect.setY(buttonRect.y() - (cRealButtonLength[scrollbarSizeToIndex(controlSize)] - buttonRect.height()));
>     }
> 
>     return paintRect;
>@@ -337,19 +346,19 @@ IntRect ScrollbarThemeMac::backButtonRect(Scrollbar& scrollbar, ScrollbarPart pa
>     bool outerButton = part == BackButtonStartPart && (buttonsPlacement() == ScrollbarButtonsDoubleStart || buttonsPlacement() == ScrollbarButtonsDoubleBoth);
>     if (outerButton) {
>         if (scrollbar.orientation() == HorizontalScrollbar)
>-            result = IntRect(scrollbar.x(), scrollbar.y(), cOuterButtonLength[scrollbar.controlSize()] + (painting ? cOuterButtonOverlap : 0), thickness);
>+            result = IntRect(scrollbar.x(), scrollbar.y(), cOuterButtonLength[scrollbarSizeToIndex(scrollbar.controlSize())] + (painting ? cOuterButtonOverlap : 0), thickness);
>         else
>-            result = IntRect(scrollbar.x(), scrollbar.y(), thickness, cOuterButtonLength[scrollbar.controlSize()] + (painting ? cOuterButtonOverlap : 0));
>+            result = IntRect(scrollbar.x(), scrollbar.y(), thickness, cOuterButtonLength[scrollbarSizeToIndex(scrollbar.controlSize())] + (painting ? cOuterButtonOverlap : 0));
>         return result;
>     }
>     
>     // Our repaint rect is slightly larger, since we are a button that is adjacent to the track.
>     if (scrollbar.orientation() == HorizontalScrollbar) {
>-        int start = part == BackButtonStartPart ? scrollbar.x() : scrollbar.x() + scrollbar.width() - cOuterButtonLength[scrollbar.controlSize()] - cButtonLength[scrollbar.controlSize()];
>-        result = IntRect(start, scrollbar.y(), cButtonLength[scrollbar.controlSize()], thickness);
>+        int start = part == BackButtonStartPart ? scrollbar.x() : scrollbar.x() + scrollbar.width() - cOuterButtonLength[scrollbarSizeToIndex(scrollbar.controlSize())] - cButtonLength[scrollbarSizeToIndex(scrollbar.controlSize())];
>+        result = IntRect(start, scrollbar.y(), cButtonLength[scrollbarSizeToIndex(scrollbar.controlSize())], thickness);
>     } else {
>-        int start = part == BackButtonStartPart ? scrollbar.y() : scrollbar.y() + scrollbar.height() - cOuterButtonLength[scrollbar.controlSize()] - cButtonLength[scrollbar.controlSize()];
>-        result = IntRect(scrollbar.x(), start, thickness, cButtonLength[scrollbar.controlSize()]);
>+        int start = part == BackButtonStartPart ? scrollbar.y() : scrollbar.y() + scrollbar.height() - cOuterButtonLength[scrollbarSizeToIndex(scrollbar.controlSize())] - cButtonLength[scrollbarSizeToIndex(scrollbar.controlSize())];
>+        result = IntRect(scrollbar.x(), start, thickness, cButtonLength[scrollbarSizeToIndex(scrollbar.controlSize())]);
>     }
>     
>     if (painting)
>@@ -368,8 +377,8 @@ IntRect ScrollbarThemeMac::forwardButtonRect(Scrollbar& scrollbar, ScrollbarPart
>         return result;
>         
>     int thickness = scrollbarThickness(scrollbar.controlSize());
>-    int outerButtonLength = cOuterButtonLength[scrollbar.controlSize()];
>-    int buttonLength = cButtonLength[scrollbar.controlSize()];
>+    int outerButtonLength = cOuterButtonLength[scrollbarSizeToIndex(scrollbar.controlSize())];
>+    int buttonLength = cButtonLength[scrollbarSizeToIndex(scrollbar.controlSize())];
>     
>     bool outerButton = part == ForwardButtonEndPart && (buttonsPlacement() == ScrollbarButtonsDoubleEnd || buttonsPlacement() == ScrollbarButtonsDoubleBoth);
>     if (outerButton) {
>@@ -406,8 +415,8 @@ IntRect ScrollbarThemeMac::trackRect(Scrollbar& scrollbar, bool painting)
>     int thickness = scrollbarThickness(scrollbar.controlSize());
>     int startWidth = 0;
>     int endWidth = 0;
>-    int outerButtonLength = cOuterButtonLength[scrollbar.controlSize()];
>-    int buttonLength = cButtonLength[scrollbar.controlSize()];
>+    int outerButtonLength = cOuterButtonLength[scrollbarSizeToIndex(scrollbar.controlSize())];
>+    int buttonLength = cButtonLength[scrollbarSizeToIndex(scrollbar.controlSize())];
>     int doubleButtonLength = outerButtonLength + buttonLength;
>     switch (buttonsPlacement()) {
>         case ScrollbarButtonsSingle:
>diff --git a/Source/WebCore/platform/mock/ScrollbarThemeMock.h b/Source/WebCore/platform/mock/ScrollbarThemeMock.h
>index f064e2e57437236e1c06cedce7c9acb21e0a718e..2e0c0bd2a7801b310e0220e8f038254312c90047 100644
>--- a/Source/WebCore/platform/mock/ScrollbarThemeMock.h
>+++ b/Source/WebCore/platform/mock/ScrollbarThemeMock.h
>@@ -33,7 +33,7 @@ namespace WebCore {
> // Scrollbar theme used in image snapshots, to eliminate appearance differences between platforms.
> class ScrollbarThemeMock : public ScrollbarThemeComposite {
> public:
>-    int scrollbarThickness(ScrollbarControlSize = RegularScrollbar, ScrollbarExpansionState = ScrollbarExpansionState::Expanded) override;
>+    int scrollbarThickness(ScrollbarControlSize = ScrollbarControlSize::Regular, ScrollbarExpansionState = ScrollbarExpansionState::Expanded) override;
> 
> protected:
>     bool hasButtons(Scrollbar&) override { return false; }
>diff --git a/Source/WebCore/platform/playstation/ScrollbarThemePlayStation.h b/Source/WebCore/platform/playstation/ScrollbarThemePlayStation.h
>index 0436b9fcdf978e088a0210b070408ad792e05bd1..c67111bb0f19a01468b14f880228b84624d2872c 100644
>--- a/Source/WebCore/platform/playstation/ScrollbarThemePlayStation.h
>+++ b/Source/WebCore/platform/playstation/ScrollbarThemePlayStation.h
>@@ -34,7 +34,7 @@ public:
>     ScrollbarThemePlayStation() = default;
>     virtual ~ScrollbarThemePlayStation() = default;
> 
>-    int scrollbarThickness(ScrollbarControlSize = RegularScrollbar, ScrollbarExpansionState = ScrollbarExpansionState::Expanded) override;
>+    int scrollbarThickness(ScrollbarControlSize = ScrollbarControlSize::Regular, ScrollbarExpansionState = ScrollbarExpansionState::Expanded) override;
> 
>     bool hasButtons(Scrollbar&) override;
>     bool hasThumb(Scrollbar&) override;
>diff --git a/Source/WebCore/platform/win/ScrollbarThemeWin.h b/Source/WebCore/platform/win/ScrollbarThemeWin.h
>index 055e8ef6cf9113c6c09500193b279f67cbb9b7cd..966c684dd3212f6a3a070bcc4432f93b5a0aa617 100644
>--- a/Source/WebCore/platform/win/ScrollbarThemeWin.h
>+++ b/Source/WebCore/platform/win/ScrollbarThemeWin.h
>@@ -35,7 +35,7 @@ public:
>     ScrollbarThemeWin();
>     virtual ~ScrollbarThemeWin();
> 
>-    int scrollbarThickness(ScrollbarControlSize = RegularScrollbar, ScrollbarExpansionState = ScrollbarExpansionState::Expanded) override;
>+    int scrollbarThickness(ScrollbarControlSize = ScrollbarControlSize::Regular, ScrollbarExpansionState = ScrollbarExpansionState::Expanded) override;
> 
>     void themeChanged() override;
>     
>diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp
>index 79b1c872f24db5eb66b0cc56f79f8c431169b4f7..7c04864c94f0ccc67666d171ee3bdc8ae07e24bf 100644
>--- a/Source/WebCore/rendering/RenderLayer.cpp
>+++ b/Source/WebCore/rendering/RenderLayer.cpp
>@@ -3275,7 +3275,7 @@ Ref<Scrollbar> RenderLayer::createScrollbar(ScrollbarOrientation orientation)
>     if (hasCustomScrollbarStyle)
>         widget = RenderScrollbar::createCustomScrollbar(*this, orientation, downcast<RenderBox>(actualRenderer).element());
>     else {
>-        widget = Scrollbar::createNativeScrollbar(*this, orientation, RegularScrollbar);
>+        widget = Scrollbar::createNativeScrollbar(*this, orientation, ScrollbarControlSize::Regular);
>         didAddScrollbar(widget.get(), orientation);
>         if (page().expectsWheelEventTriggers())
>             scrollAnimator().setWheelEventTestTrigger(page().testTrigger());
>diff --git a/Source/WebCore/rendering/RenderScrollbar.cpp b/Source/WebCore/rendering/RenderScrollbar.cpp
>index 308d2376cf7ea92baf06890b4b83d467f48d6a68..fed3bd9670a960aeb39bacd52508380ce3e5bf39 100644
>--- a/Source/WebCore/rendering/RenderScrollbar.cpp
>+++ b/Source/WebCore/rendering/RenderScrollbar.cpp
>@@ -42,7 +42,7 @@ Ref<Scrollbar> RenderScrollbar::createCustomScrollbar(ScrollableArea& scrollable
> }
> 
> RenderScrollbar::RenderScrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, Element* ownerElement, Frame* owningFrame)
>-    : Scrollbar(scrollableArea, orientation, RegularScrollbar, RenderScrollbarTheme::renderScrollbarTheme())
>+    : Scrollbar(scrollableArea, orientation, ScrollbarControlSize::Regular, RenderScrollbarTheme::renderScrollbarTheme())
>     , m_ownerElement(ownerElement)
>     , m_owningFrame(owningFrame)
> {
>@@ -258,7 +258,7 @@ void RenderScrollbar::paintPart(GraphicsContext& graphicsContext, ScrollbarPart
>     partRenderer->paintIntoRect(graphicsContext, location(), rect);
> }
> 
>-IntRect RenderScrollbar::buttonRect(ScrollbarPart partType)
>+IntRect RenderScrollbar::buttonRect(ScrollbarPart partType) const
> {
>     RenderScrollbarPart* partRenderer = m_parts.get(partType);
>     if (!partRenderer)
>@@ -290,7 +290,7 @@ IntRect RenderScrollbar::buttonRect(ScrollbarPart partType)
>                    isHorizontal ? height() : pixelSnappedIntSize.height());
> }
> 
>-IntRect RenderScrollbar::trackRect(int startLength, int endLength)
>+IntRect RenderScrollbar::trackRect(int startLength, int endLength) const
> {
>     RenderScrollbarPart* part = m_parts.get(TrackBGPart);
>     if (part)
>@@ -314,7 +314,7 @@ IntRect RenderScrollbar::trackRect(int startLength, int endLength)
>     return IntRect(x(), y() + startLength, width(), height() - totalLength);
> }
> 
>-IntRect RenderScrollbar::trackPieceRectWithMargins(ScrollbarPart partType, const IntRect& oldRect)
>+IntRect RenderScrollbar::trackPieceRectWithMargins(ScrollbarPart partType, const IntRect& oldRect) const
> {
>     RenderScrollbarPart* partRenderer = m_parts.get(partType);
>     if (!partRenderer)
>@@ -333,7 +333,7 @@ IntRect RenderScrollbar::trackPieceRectWithMargins(ScrollbarPart partType, const
>     return rect;
> }
> 
>-int RenderScrollbar::minimumThumbLength()
>+int RenderScrollbar::minimumThumbLength() const
> {
>     RenderScrollbarPart* partRenderer = m_parts.get(ThumbPart);
>     if (!partRenderer)
>@@ -342,7 +342,7 @@ int RenderScrollbar::minimumThumbLength()
>     return orientation() == HorizontalScrollbar ? partRenderer->width() : partRenderer->height();
> }
> 
>-float RenderScrollbar::opacity()
>+float RenderScrollbar::opacity() const
> {
>     RenderScrollbarPart* partRenderer = m_parts.get(ScrollbarBGPart);
>     if (!partRenderer)
>diff --git a/Source/WebCore/rendering/RenderScrollbar.h b/Source/WebCore/rendering/RenderScrollbar.h
>index e585605ebef84c8611037f726ea8d7f0caade8e4..b9f9f2258f956acd9e8711c30604d5b71a417214 100644
>--- a/Source/WebCore/rendering/RenderScrollbar.h
>+++ b/Source/WebCore/rendering/RenderScrollbar.h
>@@ -48,13 +48,13 @@ public:
> 
>     void paintPart(GraphicsContext&, ScrollbarPart, const IntRect&);
> 
>-    IntRect buttonRect(ScrollbarPart);
>-    IntRect trackRect(int startLength, int endLength);
>-    IntRect trackPieceRectWithMargins(ScrollbarPart, const IntRect&);
>+    IntRect buttonRect(ScrollbarPart) const;
>+    IntRect trackRect(int startLength, int endLength) const;
>+    IntRect trackPieceRectWithMargins(ScrollbarPart, const IntRect&) const;
> 
>-    int minimumThumbLength();
>+    int minimumThumbLength() const;
> 
>-    float opacity();
>+    float opacity() const;
> 
>     std::unique_ptr<RenderStyle> getScrollbarPseudoStyle(ScrollbarPart, PseudoId);
> 
>diff --git a/Source/WebCore/rendering/RenderTheme.h b/Source/WebCore/rendering/RenderTheme.h
>index 3af56ae56b941882421709c701dcfef8a5a981cd..e7a81d6d8572804b9e77c6bcc86d425f9c49e16c 100644
>--- a/Source/WebCore/rendering/RenderTheme.h
>+++ b/Source/WebCore/rendering/RenderTheme.h
>@@ -186,7 +186,7 @@ public:
>     virtual bool popupOptionSupportsTextIndent() const { return false; }
>     virtual PopupMenuStyle::PopupMenuSize popupMenuSize(const RenderStyle&, IntRect&) const { return PopupMenuStyle::PopupMenuSizeNormal; }
> 
>-    virtual ScrollbarControlSize scrollbarControlSizeForPart(ControlPart) { return RegularScrollbar; }
>+    virtual ScrollbarControlSize scrollbarControlSizeForPart(ControlPart) { return ScrollbarControlSize::Regular; }
> 
>     // Returns the repeat interval of the animation for the progress bar.
>     virtual Seconds animationRepeatIntervalForProgressBar(RenderProgress&) const;
>diff --git a/Source/WebCore/rendering/RenderThemeMac.h b/Source/WebCore/rendering/RenderThemeMac.h
>index a1361af8221988a6cd522c07060a7c1f3050bcad..c2dcbaad947035a9a87f2606f50a23cadb9bbeb7 100644
>--- a/Source/WebCore/rendering/RenderThemeMac.h
>+++ b/Source/WebCore/rendering/RenderThemeMac.h
>@@ -66,7 +66,7 @@ public:
>     Color platformActiveTextSearchHighlightColor(OptionSet<StyleColor::Options>) const final;
>     Color platformInactiveTextSearchHighlightColor(OptionSet<StyleColor::Options>) const final;
> 
>-    ScrollbarControlSize scrollbarControlSizeForPart(ControlPart) final { return SmallScrollbar; }
>+    ScrollbarControlSize scrollbarControlSizeForPart(ControlPart) final { return ScrollbarControlSize::Small; }
> 
>     int minimumMenuListSize(const RenderStyle&) const final;
> 
>diff --git a/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm b/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm
>index f6f41f9234203bbaccca320f9f27cb5fa7962bbb..357fdd024fe44845c9def84fa4e612d7098c98b7 100644
>--- a/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm
>+++ b/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm
>@@ -766,7 +766,7 @@ const PluginView* PDFPlugin::pluginView() const
> 
> Ref<Scrollbar> PDFPlugin::createScrollbar(ScrollbarOrientation orientation)
> {
>-    auto widget = Scrollbar::createNativeScrollbar(*this, orientation, RegularScrollbar);
>+    auto widget = Scrollbar::createNativeScrollbar(*this, orientation, ScrollbarControlSize::Regular);
>     if (orientation == HorizontalScrollbar) {
>         m_horizontalScrollbarLayer = adoptNS([[WKPDFPluginScrollbarLayer alloc] initWithPDFPlugin:this]);
>         [m_containerLayer addSublayer:m_horizontalScrollbarLayer.get()];

Actions: View | Formatted Diff | Diff

Attachments on bug 199325: 373129 | 404466 | 404548 | 404554 | 404555