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

Unified Diff: Source/core/page/EventHandler.cpp

Issue 23654015: Avoid using !OS() constructs. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix merge Created 7 years, 3 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 | « no previous file | Source/core/platform/graphics/FontPlatformData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/EventHandler.cpp
diff --git a/Source/core/page/EventHandler.cpp b/Source/core/page/EventHandler.cpp
index e062df82eb9079bec562af327f8581abf6ff6f57..e24d2b53ff2d0b02af5a60ccecc7819a74e69e3e 100644
--- a/Source/core/page/EventHandler.cpp
+++ b/Source/core/page/EventHandler.cpp
@@ -2079,15 +2079,15 @@ bool EventHandler::isInsideScrollbar(const IntPoint& windowPoint) const
bool EventHandler::shouldTurnVerticalTicksIntoHorizontal(const HitTestResult& result, const PlatformWheelEvent& event) const
{
-#if OS(POSIX) && !OS(MACOSX)
+#if OS(ANDROID) || OS(MACOSX) || OS(WIN)
+ UNUSED_PARAM(result);
+ UNUSED_PARAM(event);
+ return false;
+#else
// GTK+ must scroll horizontally if the mouse pointer is on top of the
// horizontal scrollbar while scrolling with the wheel.
// This code comes from gtk/EventHandlerGtk.cpp.
return !event.hasPreciseScrollingDeltas() && result.scrollbar() && result.scrollbar()->orientation() == HorizontalScrollbar;
-#else
- UNUSED_PARAM(result);
- UNUSED_PARAM(event);
- return false;
#endif
}
« no previous file with comments | « no previous file | Source/core/platform/graphics/FontPlatformData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698