Attachment 359155 Details for Bug 193442 – patch

[patch] patch

scrollbar-alphalocked-remove-3.patch (text/plain), 4.37 KB, created by Antti Koivisto on 2019-01-15 05:16:09 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Antti Koivisto

Created: 2019-01-15 05:16:09 PST

Size: 4.37 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 239981)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2019-01-15  Antti Koivisto  <antti@apple.com>
>+
>+        Remove unused fields from Scrollbar
>+        https://bugs.webkit.org/show_bug.cgi?id=193442
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/Scrollbar.cpp:
>+        (WebCore::Scrollbar::Scrollbar):
>+        * platform/Scrollbar.h:
>+        (WebCore::Scrollbar::isAlphaLocked const): Deleted.
>+        (WebCore::Scrollbar::setIsAlphaLocked): Deleted.
>+        (WebCore::Scrollbar::opacity const): Deleted.
>+        (WebCore::Scrollbar::setOpacity): Deleted.
>+        * platform/mac/ScrollAnimatorMac.mm:
>+        (WebCore::ScrollAnimatorMac::shouldScrollbarParticipateInHitTesting):
>+
> 2019-01-11  Antoine Quint  <graouts@apple.com>
> 
>         Support parsing of additional values for the touch-action property
>Index: Source/WebCore/platform/Scrollbar.cpp
>===================================================================
>--- Source/WebCore/platform/Scrollbar.cpp	(revision 239980)
>+++ Source/WebCore/platform/Scrollbar.cpp	(working copy)
>@@ -59,23 +59,7 @@ Scrollbar::Scrollbar(ScrollableArea& scr
>     , m_orientation(orientation)
>     , m_controlSize(controlSize)
>     , m_theme(customTheme ? *customTheme : ScrollbarTheme::theme())
>-    , m_visibleSize(0)
>-    , m_totalSize(0)
>-    , m_currentPos(0)
>-    , m_dragOrigin(0)
>-    , m_lineStep(0)
>-    , m_pageStep(0)
>-    , m_pixelStep(1)
>-    , m_hoveredPart(NoPart)
>-    , m_pressedPart(NoPart)
>-    , m_pressedPos(0)
>-    , m_scrollPos(0)
>-    , m_draggingDocument(false)
>-    , m_documentDragPos(0)
>-    , m_enabled(true)
>     , m_scrollTimer(*this, &Scrollbar::autoscrollTimerFired)
>-    , m_suppressInvalidation(false)
>-    , m_isAlphaLocked(false)
>     , m_isCustomScrollbar(isCustomScrollbar)
> {
>     theme().registerScrollbar(*this);
>Index: Source/WebCore/platform/Scrollbar.h
>===================================================================
>--- Source/WebCore/platform/Scrollbar.h	(revision 239980)
>+++ Source/WebCore/platform/Scrollbar.h	(working copy)
>@@ -124,12 +124,6 @@ public:
> 
>     void moveThumb(int pos, bool draggingDocument = false);
> 
>-    bool isAlphaLocked() const { return m_isAlphaLocked; }
>-    void setIsAlphaLocked(bool flag) { m_isAlphaLocked = flag; }
>-
>-    float opacity() const { return m_opacity; }
>-    void setOpacity(float opacity) { m_opacity = opacity; }
>-
>     bool supportsUpdateOnSecondaryThread() const;
> 
> protected:
>@@ -151,32 +145,27 @@ protected:
>     ScrollbarControlSize m_controlSize;
>     ScrollbarTheme& m_theme;
> 
>-    int m_visibleSize;
>-    int m_totalSize;
>-    float m_currentPos;
>-    float m_dragOrigin;
>-    int m_lineStep;
>-    int m_pageStep;
>-    float m_pixelStep;
>-
>-    ScrollbarPart m_hoveredPart;
>-    ScrollbarPart m_pressedPart;
>-    int m_pressedPos;
>-    float m_scrollPos;
>-    bool m_draggingDocument;
>-    int m_documentDragPos;
>+    int m_visibleSize { 0 };
>+    int m_totalSize { 0 };
>+    float m_currentPos { 0 };
>+    float m_dragOrigin { 0 };
>+    int m_lineStep { 0 };
>+    int m_pageStep { 0 };
>+    float m_pixelStep { 1 };
>+
>+    ScrollbarPart m_hoveredPart { NoPart };
>+    ScrollbarPart m_pressedPart { NoPart };
>+    int m_pressedPos { 0 };
>+    bool m_draggingDocument { false };
>+    int m_documentDragPos { 0 };
> 
>-    bool m_enabled;
>+    bool m_enabled { true };
> 
>     Timer m_scrollTimer;
> 
>-    bool m_suppressInvalidation;
>-
>-    bool m_isAlphaLocked;
>-
>-    bool m_isCustomScrollbar;
>+    bool m_suppressInvalidation { false };
> 
>-    float m_opacity { 1 };
>+    bool m_isCustomScrollbar { false };
> 
> private:
>     bool isScrollbar() const override { return true; }
>Index: Source/WebCore/platform/mac/ScrollAnimatorMac.mm
>===================================================================
>--- Source/WebCore/platform/mac/ScrollAnimatorMac.mm	(revision 239980)
>+++ Source/WebCore/platform/mac/ScrollAnimatorMac.mm	(working copy)
>@@ -1125,9 +1125,6 @@ bool ScrollAnimatorMac::shouldScrollbarP
>     if (ScrollerStyle::recommendedScrollerStyle() != NSScrollerStyleOverlay)
>         return true;
> 
>-    if (scrollbar->isAlphaLocked())
>-        return true;
>-
>     // Overlay scrollbars should participate in hit testing whenever they are at all visible.
>     NSScrollerImp *painter = scrollerImpForScrollbar(*scrollbar);
>     if (!painter)

Actions: View | Formatted Diff | Diff

Attachments on bug 193442: 359155 | 359157