Changeset 119684 in webkit

Timestamp:

Jun 6, 2012 10:56:12 PM (12 years ago)

Author:

rjkroege@chromium.org

Message:

Source/WebCore: [Chromium] Re-enable handling of smooth scrolling on Chromium Linux/Windows
​https://bugs.webkit.org/show_bug.cgi?id=87535 by adding support for
m_hasPreciseScrollingDelta on all Chromium platforms and adjusting ScrollAnimator
and ScrollAnimatorNone accordingly to let m_hasPreciseScrollingDelta == true
force exact (non-animated) scrolling.

Reviewed by James Robinson.

Updated WebKit unit tests to validate change.

• platform/PlatformWheelEvent.h:

(WebCore::PlatformWheelEvent::PlatformWheelEvent): Adjusted #ifdefs to
make m_hasPreciseScrollingDelta available on all Chromium platforms.
(PlatformWheelEvent):

• platform/ScrollAnimator.cpp:

(WebCore::ScrollAnimator::handleWheelEvent): Default scroll type is set based on
m_hasPreciseScrollingDelta value.

• platform/ScrollAnimatorNone.cpp:

(WebCore::ScrollAnimatorNone::scroll): Scroll precisely when necessary.

• platform/ScrollTypes.h: Added additional pixel scrolling subtype.
• platform/ScrollableArea.cpp:

(WebCore::ScrollableArea::scroll): Updated for additional pixel scroll subtype.

Source/WebKit/chromium: [Chromium] Re-enable handling of smooth scrolling on Chromium Linux/Windows
​https://bugs.webkit.org/show_bug.cgi?id=87535 by adding support for precise
scrolling deltas on all Chromium platforms.

Reviewed by James Robinson.

• src/WebInputEventConversion.cpp:

(WebKit::PlatformWheelEventBuilder::PlatformWheelEventBuilder): Create PlatformWheelEvents
with m_hasPreciseScrollingDelta flag as required.

• tests/ScrollAnimatorNoneTest.cpp: Added new unit test condiiton for precise scrolling.

(TEST):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/PlatformWheelEvent.h (modified) (4 diffs)
• WebCore/platform/ScrollAnimator.cpp (modified) (3 diffs)
• WebCore/platform/ScrollAnimatorNone.cpp (modified) (1 diff)
• WebCore/platform/ScrollTypes.h (modified) (1 diff)
• WebCore/platform/ScrollableArea.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebInputEventConversion.cpp (modified) (1 diff)
• WebKit/chromium/tests/ScrollAnimatorNoneTest.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-06  Robert Kroeger  <rjkroege@chromium.org>
+
+        [Chromium] Re-enable handling of smooth scrolling on Chromium Linux/Windows
+        https://bugs.webkit.org/show_bug.cgi?id=87535 by adding support for
+        m_hasPreciseScrollingDelta on all Chromium platforms and adjusting ScrollAnimator
+        and ScrollAnimatorNone accordingly to let m_hasPreciseScrollingDelta == true
+        force exact (non-animated) scrolling.
+
+        Reviewed by James Robinson.
+
+        Updated WebKit unit tests to validate change.
+
+        * platform/PlatformWheelEvent.h:
+        (WebCore::PlatformWheelEvent::PlatformWheelEvent): Adjusted #ifdefs to
+        make m_hasPreciseScrollingDelta available on all Chromium platforms.
+        (PlatformWheelEvent):
+        * platform/ScrollAnimator.cpp:
+        (WebCore::ScrollAnimator::handleWheelEvent): Default scroll type is set based on 
+        m_hasPreciseScrollingDelta value.
+        * platform/ScrollAnimatorNone.cpp:
+        (WebCore::ScrollAnimatorNone::scroll): Scroll precisely when necessary.
+        * platform/ScrollTypes.h: Added additional pixel scrolling subtype.
+        * platform/ScrollableArea.cpp:
+        (WebCore::ScrollableArea::scroll): Updated for additional pixel scroll subtype.
+
 2012-06-06  Michal Mocny  <mmocny@google.com>
 

trunk/Source/WebCore/platform/PlatformWheelEvent.h

@@ -91 +91 @@
             , m_granularity(ScrollByPixelWheelEvent)
             , m_directionInvertedFromDevice(false)
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
             , m_hasPreciseScrollingDeltas(false)
+#endif
+#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
             , m_phase(PlatformWheelEventPhaseNone)
             , m_momentumPhase(PlatformWheelEventPhaseNone)
@@ -112 +114 @@
             , m_granularity(granularity)
             , m_directionInvertedFromDevice(false)
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
             , m_hasPreciseScrollingDeltas(false)
-            , m_phase(PlatformWheelEventPhaseNone)
+#endif
+#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+           , m_phase(PlatformWheelEventPhaseNone)
             , m_momentumPhase(PlatformWheelEventPhaseNone)
             , m_scrollCount(0)
@@ -156 +160 @@
 #endif
 
+#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+       bool hasPreciseScrollingDeltas() const { return m_hasPreciseScrollingDeltas; }
+#endif
 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
         PlatformWheelEventPhase phase() const { return m_phase; }
         PlatformWheelEventPhase momentumPhase() const { return m_momentumPhase; }
-        bool hasPreciseScrollingDeltas() const { return m_hasPreciseScrollingDeltas; }
-
         unsigned scrollCount() const { return m_scrollCount; }
         float unacceleratedScrollingDeltaX() const { return m_unacceleratedScrollingDeltaX; }
@@ -188 +193 @@
         PlatformWheelEventGranularity m_granularity;
         bool m_directionInvertedFromDevice;
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
         bool m_hasPreciseScrollingDeltas;
-        PlatformWheelEventPhase m_phase;
+#endif
+#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+         PlatformWheelEventPhase m_phase;
         PlatformWheelEventPhase m_momentumPhase;
         unsigned m_scrollCount;

trunk/Source/WebCore/platform/ScrollAnimator.cpp

@@ -92 +92 @@
     bool handled = false;
 
+#if PLATFORM(CHROMIUM)
+    ScrollGranularity granularity = e.hasPreciseScrollingDeltas() ? ScrollByPrecisePixel : ScrollByPixel;
+#else
+    ScrollGranularity granularity = ScrollByPixel;
+#endif
+
     IntSize maxForwardScrollDelta = m_scrollableArea->maximumScrollPosition() - m_scrollableArea->scrollPosition();
     IntSize maxBackwardScrollDelta = m_scrollableArea->scrollPosition() - m_scrollableArea->minimumScrollPosition();
@@ -112 +118 @@
                     deltaY = -deltaY;
             }
-            scroll(VerticalScrollbar, ScrollByPixel, verticalScrollbar->pixelStep(), -deltaY);
+            scroll(VerticalScrollbar, granularity, verticalScrollbar->pixelStep(), -deltaY);
         }
 
@@ -122 +128 @@
                     deltaX = -deltaX;
             }
-            scroll(HorizontalScrollbar, ScrollByPixel, horizontalScrollbar->pixelStep(), -deltaX);
+            scroll(HorizontalScrollbar, granularity, horizontalScrollbar->pixelStep(), -deltaX);
         }
     }

trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp

@@ -435 +435 @@
         break;
     case ScrollByPixel:
-#if PLATFORM(CHROMIUM)
-        // FIXME: plumb a flag specifying precise deltas.
-        return ScrollAnimator::scroll(orientation, granularity, step, multiplier);
-#else
         parameters = Parameters(true, 11 * kTickTime, 2 * kTickTime, Cubic, 3 * kTickTime, Cubic, 3 * kTickTime, Quadratic, 1.25);
         break;
-#endif
+    case ScrollByPrecisePixel:
+        return ScrollAnimator::scroll(orientation, granularity, step, multiplier);
     case ScrollByPixelVelocity:
         // FIXME: Generalize the scroll interface to support a richer set of parameters.

trunk/Source/WebCore/platform/ScrollTypes.h

@@ -107 +107 @@
         ScrollByDocument,
         ScrollByPixel,
-        ScrollByPixelVelocity
+        ScrollByPixelVelocity,
+        ScrollByPrecisePixel
     };
 

trunk/Source/WebCore/platform/ScrollableArea.cpp

@@ -109 +109 @@
         break;
     case ScrollByPixel:
+    case ScrollByPrecisePixel:
         step = scrollbar->pixelStep();
         break;

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-06-06  Robert Kroeger  <rjkroege@chromium.org>
+
+        [Chromium] Re-enable handling of smooth scrolling on Chromium Linux/Windows
+        https://bugs.webkit.org/show_bug.cgi?id=87535 by adding support for precise
+        scrolling deltas on all Chromium platforms.
+
+        Reviewed by James Robinson.
+
+        * src/WebInputEventConversion.cpp:
+        (WebKit::PlatformWheelEventBuilder::PlatformWheelEventBuilder): Create PlatformWheelEvents
+        with m_hasPreciseScrollingDelta flag as required.
+        * tests/ScrollAnimatorNoneTest.cpp: Added new unit test condiiton for precise scrolling.
+        (TEST):
+
 2012-06-06  Michal Mocny  <mmocny@google.com>
 

trunk/Source/WebKit/chromium/src/WebInputEventConversion.cpp

@@ -124 +124 @@
         m_modifiers |= PlatformEvent::MetaKey;
 
+    m_hasPreciseScrollingDeltas = e.hasPreciseScrollingDeltas;
 #if OS(DARWIN)
-    m_hasPreciseScrollingDeltas = e.hasPreciseScrollingDeltas;
     m_phase = static_cast<WebCore::PlatformWheelEventPhase>(e.phase);
     m_momentumPhase = static_cast<WebCore::PlatformWheelEventPhase>(e.momentumPhase);

trunk/Source/WebKit/chromium/tests/ScrollAnimatorNoneTest.cpp

@@ -111 +111 @@
 
     EXPECT_CALL(scrollableArea, scrollSize(_)).Times(AtLeast(1)).WillRepeatedly(Return(1000));
-    EXPECT_CALL(scrollableArea, setScrollOffset(_)).Times(3);
+    EXPECT_CALL(scrollableArea, setScrollOffset(_)).Times(4);
 
     scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByLine, 100, 1);
@@ -126 +126 @@
 
     scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByPixel, 4, 25);
+    EXPECT_NE(100, scrollAnimatorNone.currentX());
+    EXPECT_NE(0, scrollAnimatorNone.currentX());
+    EXPECT_EQ(0, scrollAnimatorNone.currentY());
+    scrollAnimatorNone.reset();
+
+    scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByPrecisePixel, 4, 25);
     EXPECT_EQ(100, scrollAnimatorNone.currentX());
     EXPECT_NE(0, scrollAnimatorNone.currentX());