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

Unified Diff: Source/web/WebViewImpl.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/WebViewImpl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index 290a5390684c979fb31ec961c8ec6ce091a7203e..dcfbd0aa20221c191454e21706336f561e2ad99e 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -1559,7 +1559,7 @@ bool WebViewImpl::keyEventDefault(const WebKeyboardEvent& event)
bool WebViewImpl::scrollViewWithKeyboard(int keyCode, int modifiers)
{
- ScrollDirection scrollDirection;
+ ScrollDirectionPhysical scrollDirectionPhysical;
ScrollGranularity scrollGranularity;
#if OS(MACOSX)
// Control-Up/Down should be PageUp/Down on Mac.
@@ -1570,17 +1570,17 @@ bool WebViewImpl::scrollViewWithKeyboard(int keyCode, int modifiers)
keyCode = VKEY_NEXT;
}
#endif
- if (!mapKeyCodeForScroll(keyCode, &scrollDirection, &scrollGranularity))
+ if (!mapKeyCodeForScroll(keyCode, &scrollDirectionPhysical, &scrollGranularity))
return false;
if (LocalFrame* frame = toLocalFrame(focusedCoreFrame()))
- return frame->eventHandler().bubblingScroll(scrollDirection, scrollGranularity);
+ return frame->eventHandler().bubblingScroll(toScrollDirection(scrollDirectionPhysical), scrollGranularity);
return false;
}
bool WebViewImpl::mapKeyCodeForScroll(
int keyCode,
- ScrollDirection* scrollDirection,
+ ScrollDirectionPhysical* scrollDirection,
ScrollGranularity* scrollGranularity)
{
switch (keyCode) {
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698