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

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

Issue 2782893002: WebMouseEvent coordinates are now fractional & private (Closed)
Patch Set: Rebased, fixed a comment in web_input_event_builders_mac.mm Created 3 years, 8 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_messages.h" 10 #include "content/common/input_messages.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 for (unsigned i = 0; i < web_touch.touchesLength; i++) 58 for (unsigned i = 0; i < web_touch.touchesLength; i++)
59 CHECK(web_touch.touches[i].state != WebTouchPoint::StatePressed || 59 CHECK(web_touch.touches[i].state != WebTouchPoint::StatePressed ||
60 PointIsWithinContents(web_touch.touches[i].position.x, 60 PointIsWithinContents(web_touch.touches[i].position.x,
61 web_touch.touches[i].position.y)) 61 web_touch.touches[i].position.y))
62 << "Touch coordinates are not within content bounds on TouchStart."; 62 << "Touch coordinates are not within content bounds on TouchStart.";
63 63
64 DispatchWebTouchEventToPlatform(web_touch, latency_info); 64 DispatchWebTouchEventToPlatform(web_touch, latency_info);
65 } else if (event.type() == WebInputEvent::MouseWheel) { 65 } else if (event.type() == WebInputEvent::MouseWheel) {
66 const WebMouseWheelEvent& web_wheel = 66 const WebMouseWheelEvent& web_wheel =
67 static_cast<const WebMouseWheelEvent&>(event); 67 static_cast<const WebMouseWheelEvent&>(event);
68 CHECK(PointIsWithinContents(web_wheel.x, web_wheel.y)) 68 CHECK(PointIsWithinContents(web_wheel.positionInWidget().x,
69 web_wheel.positionInWidget().y))
69 << "Mouse wheel position is not within content bounds."; 70 << "Mouse wheel position is not within content bounds.";
70 DispatchWebMouseWheelEventToPlatform(web_wheel, latency_info); 71 DispatchWebMouseWheelEventToPlatform(web_wheel, latency_info);
71 } else if (WebInputEvent::isMouseEventType(event.type())) { 72 } else if (WebInputEvent::isMouseEventType(event.type())) {
72 const WebMouseEvent& web_mouse = 73 const WebMouseEvent& web_mouse =
73 static_cast<const WebMouseEvent&>(event); 74 static_cast<const WebMouseEvent&>(event);
74 CHECK(event.type() != WebInputEvent::MouseDown || 75 CHECK(event.type() != WebInputEvent::MouseDown ||
75 PointIsWithinContents(web_mouse.x, web_mouse.y)) 76 PointIsWithinContents(web_mouse.positionInWidget().x,
77 web_mouse.positionInWidget().y))
76 << "Mouse pointer is not within content bounds on MouseDown."; 78 << "Mouse pointer is not within content bounds on MouseDown.";
77 DispatchWebMouseEventToPlatform(web_mouse, latency_info); 79 DispatchWebMouseEventToPlatform(web_mouse, latency_info);
78 } else { 80 } else {
79 NOTREACHED(); 81 NOTREACHED();
80 } 82 }
81 } 83 }
82 84
83 void SyntheticGestureTargetBase::DispatchWebTouchEventToPlatform( 85 void SyntheticGestureTargetBase::DispatchWebTouchEventToPlatform(
84 const blink::WebTouchEvent& web_touch, 86 const blink::WebTouchEvent& web_touch,
85 const ui::LatencyInfo& latency_info) { 87 const ui::LatencyInfo& latency_info) {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 return 0.0f; 128 return 0.0f;
127 } 129 }
128 130
129 bool SyntheticGestureTargetBase::PointIsWithinContents(int x, int y) const { 131 bool SyntheticGestureTargetBase::PointIsWithinContents(int x, int y) const {
130 gfx::Rect bounds = host_->GetView()->GetViewBounds(); 132 gfx::Rect bounds = host_->GetView()->GetViewBounds();
131 bounds -= bounds.OffsetFromOrigin(); // Translate the bounds to (0,0). 133 bounds -= bounds.OffsetFromOrigin(); // Translate the bounds to (0,0).
132 return bounds.Contains(x, y); 134 return bounds.Contains(x, y);
133 } 135 }
134 136
135 } // namespace content 137 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698