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

Unified Diff: Source/web/WebPluginScrollbarImpl.cpp

Issue 1147283002: Add ScrollDirectionPhysical enum in Scroll types. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed a conflict on EventHandler 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
« no previous file with comments | « Source/web/WebPluginContainerImpl.cpp ('k') | Source/web/WebViewImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebPluginScrollbarImpl.cpp
diff --git a/Source/web/WebPluginScrollbarImpl.cpp b/Source/web/WebPluginScrollbarImpl.cpp
index 3b136b784d54369e314910ae5496743a526ddeb7..5da18b4ebeee3a4b99746ffdd9e1761b95cfdf6e 100644
--- a/Source/web/WebPluginScrollbarImpl.cpp
+++ b/Source/web/WebPluginScrollbarImpl.cpp
@@ -217,7 +217,7 @@ void WebPluginScrollbarImpl::setDocumentSize(int size)
void WebPluginScrollbarImpl::scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier)
{
- blink::ScrollDirection dir;
+ blink::ScrollDirectionPhysical dir;
bool horizontal = m_scrollbar->orientation() == HorizontalScrollbar;
if (direction == ScrollForward)
dir = horizontal ? ScrollRight : ScrollDown;
@@ -354,7 +354,7 @@ bool WebPluginScrollbarImpl::onKeyDown(const WebInputEvent& event)
keyCode = keyboard.windowsKeyCode;
}
- blink::ScrollDirection scrollDirection;
+ blink::ScrollDirectionPhysical scrollDirection;
blink::ScrollGranularity scrollGranularity;
if (WebViewImpl::mapKeyCodeForScroll(keyCode, &scrollDirection, &scrollGranularity)) {
// Will return false if scroll direction wasn't compatible with this scrollbar.
« no previous file with comments | « Source/web/WebPluginContainerImpl.cpp ('k') | Source/web/WebViewImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698