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

Unified Diff: content/child/blink_platform_impl.cc

Issue 304793003: use enum to specify deviceSource for fling animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased for parallel breaking changes Created 6 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 | « content/child/blink_platform_impl.h ('k') | content/common/input/input_event_stream_validator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/blink_platform_impl.cc
diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc
index ca09c86dd7069c8bae01dd9dee4a57442fcdcc46..5a368439f463ef36e6a5e92c7d1ee3acb47415c7 100644
--- a/content/child/blink_platform_impl.cc
+++ b/content/child/blink_platform_impl.cc
@@ -46,7 +46,6 @@
#include "third_party/WebKit/public/platform/WebData.h"
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/WebWaitableEvent.h"
-#include "third_party/WebKit/public/web/WebInputEvent.h"
#include "ui/base/layout.h"
#if defined(OS_ANDROID)
@@ -878,7 +877,7 @@ void BlinkPlatformImpl::callOnMainThread(
}
blink::WebGestureCurve* BlinkPlatformImpl::createFlingAnimationCurve(
- int device_source,
+ blink::WebGestureDevice device_source,
const blink::WebFloatPoint& velocity,
const blink::WebSize& cumulative_scroll) {
#if defined(OS_ANDROID)
@@ -887,7 +886,7 @@ blink::WebGestureCurve* BlinkPlatformImpl::createFlingAnimationCurve(
cumulative_scroll);
#endif
- if (device_source == blink::WebGestureEvent::Touchscreen)
+ if (device_source == blink::WebGestureDeviceTouchscreen)
return fling_curve_configuration_->CreateForTouchScreen(velocity,
cumulative_scroll);
« no previous file with comments | « content/child/blink_platform_impl.h ('k') | content/common/input/input_event_stream_validator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698