Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Unified Diff: Source/platform/scroll/Scrollbar.cpp

Issue 1147283002: Add ScrollDirectionPhysical enum in Scroll types. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;

Powered by Google App Engine
This is Rietveld 408576698