Attachment 347994 Details for Bug 188915 – Patch for EWS

[patch] Patch for EWS

scrollbyprecisepixel.patch (text/plain), 2.43 KB, created by Frédéric Wang (:fredw) on 2018-08-23 23:22:42 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frédéric Wang (:fredw)

Created: 2018-08-23 23:22:42 PDT

Size: 2.43 KB

patch

obsolete

>diff --git a/Source/WebCore/platform/ScrollAnimatorSmooth.cpp b/Source/WebCore/platform/ScrollAnimatorSmooth.cpp
>index 27562d46094..defc3f1978f 100644
>--- a/Source/WebCore/platform/ScrollAnimatorSmooth.cpp
>+++ b/Source/WebCore/platform/ScrollAnimatorSmooth.cpp
>@@ -60,7 +60,7 @@ ScrollAnimatorSmooth::~ScrollAnimatorSmooth() = default;
> 
> bool ScrollAnimatorSmooth::scroll(ScrollbarOrientation orientation, ScrollGranularity granularity, float step, float multiplier)
> {
>-    if (!m_scrollableArea.scrollAnimatorEnabled() || granularity == ScrollByPrecisePixel)
>+    if (!m_scrollableArea.scrollAnimatorEnabled())
>         return ScrollAnimator::scroll(orientation, granularity, step, multiplier);
> 
>     return m_animation->scroll(orientation, granularity, step, multiplier);
>diff --git a/Source/WebCore/platform/ScrollTypes.h b/Source/WebCore/platform/ScrollTypes.h
>index b928b73efb9..33f38c31168 100644
>--- a/Source/WebCore/platform/ScrollTypes.h
>+++ b/Source/WebCore/platform/ScrollTypes.h
>@@ -108,8 +108,7 @@ enum ScrollGranularity : uint8_t {
>     ScrollByLine,
>     ScrollByPage,
>     ScrollByDocument,
>-    ScrollByPixel,
>-    ScrollByPrecisePixel
>+    ScrollByPixel
> };
> 
> enum ScrollElasticity {
>diff --git a/Source/WebCore/platform/ScrollableArea.cpp b/Source/WebCore/platform/ScrollableArea.cpp
>index 46e71eacbeb..7b1d359dbc6 100644
>--- a/Source/WebCore/platform/ScrollableArea.cpp
>+++ b/Source/WebCore/platform/ScrollableArea.cpp
>@@ -127,7 +127,6 @@ bool ScrollableArea::scroll(ScrollDirection direction, ScrollGranularity granula
>         step = scrollbar->totalSize();
>         break;
>     case ScrollByPixel:
>-    case ScrollByPrecisePixel:
>         step = scrollbar->pixelStep();
>         break;
>     }
>diff --git a/Source/WebCore/platform/gtk/ScrollAnimatorGtk.cpp b/Source/WebCore/platform/gtk/ScrollAnimatorGtk.cpp
>index 444fe069cbb..8366f469654 100644
>--- a/Source/WebCore/platform/gtk/ScrollAnimatorGtk.cpp
>+++ b/Source/WebCore/platform/gtk/ScrollAnimatorGtk.cpp
>@@ -82,7 +82,7 @@ void ScrollAnimatorGtk::ensureSmoothScrollingAnimation()
> #if ENABLE(SMOOTH_SCROLLING)
> bool ScrollAnimatorGtk::scroll(ScrollbarOrientation orientation, ScrollGranularity granularity, float step, float multiplier)
> {
>-    if (!m_scrollableArea.scrollAnimatorEnabled() || granularity == ScrollByPrecisePixel)
>+    if (!m_scrollableArea.scrollAnimatorEnabled())
>         return ScrollAnimator::scroll(orientation, granularity, step, multiplier);
> 
>     ensureSmoothScrollingAnimation();

Actions: View | Formatted Diff | Diff

Attachments on bug 188915: 347994 | 348000