Changeset 194513 in webkit

Timestamp:

Jan 3, 2016 8:56:02 AM (8 years ago)

Author:

Simon Fraser

Message:

Some cleanup in ScrollAnimator
​https://bugs.webkit.org/show_bug.cgi?id=152649

Try to fix GTK scroll position errors in RTL.

ScrollAnimatorNone::scrollToOffsetWithoutAnimation() was failing to map from
offset to position.

Also add logging in ScrollableArea::scrollToOffsetWithoutAnimation().

• platform/ScrollAnimatorNone.cpp:

(WebCore::ScrollAnimatorNone::scrollToOffsetWithoutAnimation):

• platform/ScrollableArea.cpp:

(WebCore::ScrollableArea::scrollToOffsetWithoutAnimation):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ScrollAnimatorNone.cpp (modified) (1 diff)
• platform/ScrollableArea.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-03  Simon Fraser  <simon.fraser@apple.com>
+
+        Some cleanup in ScrollAnimator
+        https://bugs.webkit.org/show_bug.cgi?id=152649
+
+        Try to fix GTK scroll position errors in RTL.
+        
+        ScrollAnimatorNone::scrollToOffsetWithoutAnimation() was failing to map from
+        offset to position.
+        
+        Also add logging in ScrollableArea::scrollToOffsetWithoutAnimation().
+
+        * platform/ScrollAnimatorNone.cpp:
+        (WebCore::ScrollAnimatorNone::scrollToOffsetWithoutAnimation):
+        * platform/ScrollableArea.cpp:
+        (WebCore::ScrollableArea::scrollToOffsetWithoutAnimation):
+
 2016-01-02  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp

@@ -449 +449 @@
 {
     stopAnimationTimerIfNeeded();
-
-    FloatSize delta = FloatSize(offset.x() - *m_horizontalData.m_currentPosition, offset.y() - *m_verticalData.m_currentPosition);
+    
+    FloatPoint position = ScrollableArea::scrollPositionFromOffset(offset, toFloatSize(m_scrollableArea.scrollOrigin()));
+    FloatSize delta = position - FloatPoint(*m_horizontalData.m_currentPosition, *m_verticalData.m_currentPosition);
 
     m_horizontalData.reset();
-    *m_horizontalData.m_currentPosition = offset.x();
-    m_horizontalData.m_desiredPosition = offset.x();
+    *m_horizontalData.m_currentPosition = position.x();
+    m_horizontalData.m_desiredPosition = position.x();
 
     m_verticalData.reset();
-    *m_verticalData.m_currentPosition = offset.y();
-    m_verticalData.m_desiredPosition = offset.y();
+    *m_verticalData.m_currentPosition = position.y();
+    m_verticalData.m_desiredPosition = position.y();
 
     notifyPositionChanged(delta);

trunk/Source/WebCore/platform/ScrollableArea.cpp

@@ -37 +37 @@
 #include "FloatPoint.h"
 #include "LayoutRect.h"
+#include "Logging.h"
 #include "PlatformWheelEvent.h"
 #include "ScrollAnimator.h"
 #include "ScrollbarTheme.h"
+#include "TextStream.h"
 
 namespace WebCore {
@@ -135 +137 @@
 void ScrollableArea::scrollToOffsetWithoutAnimation(const FloatPoint& offset)
 {
+    LOG_WITH_STREAM(Scrolling, stream << "ScrollableArea " << this << " scrollToOffsetWithoutAnimation " << offset);
     scrollAnimator().scrollToOffsetWithoutAnimation(offset);
 }