| Index: Source/platform/scroll/Scrollbar.cpp
|
| diff --git a/Source/platform/scroll/Scrollbar.cpp b/Source/platform/scroll/Scrollbar.cpp
|
| index 9f4e8fa4212c051526bc796b5effcb567709f658..0f31759f472e574da2dfe39775f63271c0213379 100644
|
| --- a/Source/platform/scroll/Scrollbar.cpp
|
| +++ b/Source/platform/scroll/Scrollbar.cpp
|
| @@ -226,7 +226,7 @@ void Scrollbar::autoscrollPressedPart(double delay)
|
| }
|
|
|
| // Handle the arrows and track.
|
| - if (m_scrollableArea && m_scrollableArea->scroll(pressedPartScrollDirection(), pressedPartScrollGranularity()))
|
| + if (m_scrollableArea && m_scrollableArea->scroll(pressedPartScrollDirectionPhysical(), pressedPartScrollGranularity()))
|
| startTimerIfNeeded(delay);
|
| }
|
|
|
| @@ -245,8 +245,8 @@ void Scrollbar::startTimerIfNeeded(double delay)
|
| }
|
|
|
| // We can't scroll if we've hit the beginning or end.
|
| - ScrollDirection dir = pressedPartScrollDirection();
|
| - if (dir == ScrollUp || dir == ScrollLeft) {
|
| + ScrollDirectionPhysical dir = pressedPartScrollDirectionPhysical();
|
| + if (dir == ScrollPhysicalUp || dir == ScrollPhysicalLeft) {
|
| if (m_currentPos == 0)
|
| return;
|
| } else {
|
| @@ -263,16 +263,16 @@ void Scrollbar::stopTimerIfNeeded()
|
| m_scrollTimer.stop();
|
| }
|
|
|
| -ScrollDirection Scrollbar::pressedPartScrollDirection()
|
| +ScrollDirectionPhysical Scrollbar::pressedPartScrollDirectionPhysical()
|
| {
|
| if (m_orientation == HorizontalScrollbar) {
|
| if (m_pressedPart == BackButtonStartPart || m_pressedPart == BackButtonEndPart || m_pressedPart == BackTrackPart)
|
| - return ScrollLeft;
|
| - return ScrollRight;
|
| + return ScrollPhysicalLeft;
|
| + return ScrollPhysicalRight;
|
| } else {
|
| if (m_pressedPart == BackButtonStartPart || m_pressedPart == BackButtonEndPart || m_pressedPart == BackTrackPart)
|
| - return ScrollUp;
|
| - return ScrollDown;
|
| + return ScrollPhysicalUp;
|
| + return ScrollPhysicalDown;
|
| }
|
| }
|
|
|
| @@ -377,7 +377,7 @@ bool Scrollbar::gestureEvent(const PlatformGestureEvent& evt)
|
| return false;
|
| case PlatformEvent::GestureTap: {
|
| if (m_pressedPart != ThumbPart && m_pressedPart != NoPart && m_scrollableArea
|
| - && m_scrollableArea->scroll(pressedPartScrollDirection(), pressedPartScrollGranularity())) {
|
| + && m_scrollableArea->scroll(pressedPartScrollDirectionPhysical(), pressedPartScrollGranularity())) {
|
| return true;
|
| }
|
| m_scrollPos = 0;
|
|
|