Changeset 109265 in webkit

Timestamp:

Feb 29, 2012 2:43:05 PM (12 years ago)

Author:

andersca@apple.com

Message:

[Chromium] Some Layout Tests in platform/chromium/rubberbanding and platform/chromium/compositing/rubberbanding are failing
​https://bugs.webkit.org/show_bug.cgi?id=79878

Reviewed by James Robinson.

Make sure that ScrollableArea::setScrollOffsetFromAnimation doesn't end up
setting the ScrollAnimator's current scroll position by making a new function, scrollPositionChanged,
that both notifyScrollPositionChanged and setScrollOffsetFromAnimation call and move the call to update
the position to notifyScrollPositionChanged.

• platform/ScrollableArea.cpp:

(WebCore::ScrollableArea::notifyScrollPositionChanged):
(WebCore):
(WebCore::ScrollableArea::scrollPositionChanged):
(WebCore::ScrollableArea::setScrollOffsetFromAnimation):

• platform/ScrollableArea.h:

(ScrollableArea):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ScrollableArea.cpp (modified) (3 diffs)
• platform/ScrollableArea.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-29  Anders Carlsson  <andersca@apple.com>
+
+        [Chromium] Some Layout Tests in platform/chromium/rubberbanding and platform/chromium/compositing/rubberbanding are failing
+        https://bugs.webkit.org/show_bug.cgi?id=79878
+
+        Reviewed by James Robinson.
+
+        Make sure that ScrollableArea::setScrollOffsetFromAnimation doesn't end up
+        setting the ScrollAnimator's current scroll position by making a new function, scrollPositionChanged,
+        that both notifyScrollPositionChanged and setScrollOffsetFromAnimation call and move the call to update
+        the position to notifyScrollPositionChanged.
+
+        * platform/ScrollableArea.cpp:
+        (WebCore::ScrollableArea::notifyScrollPositionChanged):
+        (WebCore):
+        (WebCore::ScrollableArea::scrollPositionChanged):
+        (WebCore::ScrollableArea::setScrollOffsetFromAnimation):
+        * platform/ScrollableArea.h:
+        (ScrollableArea):
+
 2012-02-29  Dana Jansens  <danakj@chromium.org>
 

trunk/Source/WebCore/platform/ScrollableArea.cpp

@@ -125 +125 @@
 void ScrollableArea::notifyScrollPositionChanged(const IntPoint& position)
 {
+    scrollPositionChanged(position);
+    scrollAnimator()->setCurrentPosition(position);
+}
+
+void ScrollableArea::scrollPositionChanged(const IntPoint& position)
+{
     // Tell the derived class to scroll its contents.
     setScrollOffset(position);
@@ -151 +157 @@
     }
 
-    scrollAnimator()->setCurrentPosition(position);
     scrollAnimator()->notifyContentAreaScrolled();
 }
@@ -171 +176 @@
         return;
 
-    notifyScrollPositionChanged(offset);
+    scrollPositionChanged(offset);
 }
 

trunk/Source/WebCore/platform/ScrollableArea.h

@@ -180 +180 @@
 
 private:
+    void scrollPositionChanged(const IntPoint&);
+    
     // NOTE: Only called from the ScrollAnimator.
     friend class ScrollAnimator;