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

Side by Side Diff: content/browser/renderer_host/input/synthetic_gesture_target_base.cc

Issue 2240983003: Move |ScopedWebInputEvent| and |WebInputEventTraits| from |content::| to "ui/events/blink" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and ncarter's review Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/input/synthetic_gesture_target_base.h" 5 #include "content/browser/renderer_host/input/synthetic_gesture_target_base.h"
6 6
7 #include "content/browser/renderer_host/render_widget_host_impl.h" 7 #include "content/browser/renderer_host/render_widget_host_impl.h"
8 #include "content/browser/renderer_host/render_widget_host_view_base.h" 8 #include "content/browser/renderer_host/render_widget_host_view_base.h"
9 #include "content/browser/renderer_host/ui_events_helper.h" 9 #include "content/browser/renderer_host/ui_events_helper.h"
10 #include "content/common/input/web_input_event_traits.h"
11 #include "content/common/input_messages.h" 10 #include "content/common/input_messages.h"
12 #include "third_party/WebKit/public/web/WebInputEvent.h" 11 #include "third_party/WebKit/public/web/WebInputEvent.h"
12 #include "ui/events/blink/web_input_event_traits.h"
13 #include "ui/events/event.h" 13 #include "ui/events/event.h"
14 #include "ui/events/latency_info.h" 14 #include "ui/events/latency_info.h"
15 15
16 using blink::WebInputEvent; 16 using blink::WebInputEvent;
17 using blink::WebTouchEvent; 17 using blink::WebTouchEvent;
18 using blink::WebTouchPoint; 18 using blink::WebTouchPoint;
19 using blink::WebMouseEvent; 19 using blink::WebMouseEvent;
20 using blink::WebMouseWheelEvent; 20 using blink::WebMouseWheelEvent;
21 21
22 namespace content { 22 namespace content {
(...skipping 16 matching lines...) Expand all
39 DCHECK(host); 39 DCHECK(host);
40 } 40 }
41 41
42 SyntheticGestureTargetBase::~SyntheticGestureTargetBase() { 42 SyntheticGestureTargetBase::~SyntheticGestureTargetBase() {
43 } 43 }
44 44
45 void SyntheticGestureTargetBase::DispatchInputEventToPlatform( 45 void SyntheticGestureTargetBase::DispatchInputEventToPlatform(
46 const WebInputEvent& event) { 46 const WebInputEvent& event) {
47 TRACE_EVENT1("input", 47 TRACE_EVENT1("input",
48 "SyntheticGestureTarget::DispatchInputEventToPlatform", 48 "SyntheticGestureTarget::DispatchInputEventToPlatform",
49 "type", WebInputEventTraits::GetName(event.type)); 49 "type", ui::WebInputEventTraits::GetName(event.type));
50 50
51 ui::LatencyInfo latency_info; 51 ui::LatencyInfo latency_info;
52 latency_info.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0); 52 latency_info.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
53 53
54 if (WebInputEvent::isTouchEventType(event.type)) { 54 if (WebInputEvent::isTouchEventType(event.type)) {
55 const WebTouchEvent& web_touch = 55 const WebTouchEvent& web_touch =
56 static_cast<const WebTouchEvent&>(event); 56 static_cast<const WebTouchEvent&>(event);
57 57
58 // Check that all touch pointers are within the content bounds. 58 // Check that all touch pointers are within the content bounds.
59 for (unsigned i = 0; i < web_touch.touchesLength; i++) 59 for (unsigned i = 0; i < web_touch.touchesLength; i++)
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 return 0.0f; 127 return 0.0f;
128 } 128 }
129 129
130 bool SyntheticGestureTargetBase::PointIsWithinContents(int x, int y) const { 130 bool SyntheticGestureTargetBase::PointIsWithinContents(int x, int y) const {
131 gfx::Rect bounds = host_->GetView()->GetViewBounds(); 131 gfx::Rect bounds = host_->GetView()->GetViewBounds();
132 bounds -= bounds.OffsetFromOrigin(); // Translate the bounds to (0,0). 132 bounds -= bounds.OffsetFromOrigin(); // Translate the bounds to (0,0).
133 return bounds.Contains(x, y); 133 return bounds.Contains(x, y);
134 } 134 }
135 135
136 } // namespace content 136 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698