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

Unified Diff: content/renderer/render_widget.cc

Issue 2863693003: Unify TouchAction classes (Closed)
Patch Set: add cstdlib Created 3 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/renderer/render_widget.h ('k') | third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 7706d466cf853b7b650d6d1e8a7854f8cfe8fe16..ce810c1bcf38dcc16975d046ca1ee559b01eaf69 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -25,6 +25,7 @@
#include "base/trace_event/trace_event_synthetic_delay.h"
#include "build/build_config.h"
#include "cc/animation/animation_host.h"
+#include "cc/input/touch_action.h"
#include "cc/output/compositor_frame_sink.h"
#include "cc/output/copy_output_request.h"
#include "cc/scheduler/begin_frame_source.h"
@@ -2246,15 +2247,13 @@ void RenderWidget::HasTouchEventHandlers(bool has_handlers) {
Send(new ViewHostMsg_HasTouchEventHandlers(routing_id_, has_handlers));
}
-void RenderWidget::SetTouchAction(blink::WebTouchAction web_touch_action) {
+void RenderWidget::SetTouchAction(cc::TouchAction touch_action) {
// Ignore setTouchAction calls that result from synthetic touch events (eg.
// when blink is emulating touch with mouse).
if (input_handler_->handling_event_type() != WebInputEvent::kTouchStart)
return;
- content::TouchAction content_touch_action =
- static_cast<content::TouchAction>(web_touch_action);
- Send(new InputHostMsg_SetTouchAction(routing_id_, content_touch_action));
+ Send(new InputHostMsg_SetTouchAction(routing_id_, touch_action));
}
void RenderWidget::RegisterRenderFrameProxy(RenderFrameProxy* proxy) {
« no previous file with comments | « content/renderer/render_widget.h ('k') | third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698