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

Side by Side Diff: content/renderer/input/input_handler_proxy.cc

Issue 148453012: Chrome requires WebTouchPoint to store WebFloatPoint, instead of WebPoint. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removing ugly floating point error fix Created 6 years, 9 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 | Annotate | Revision Log
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/renderer/input/input_handler_proxy.h" 5 #include "content/renderer/input/input_handler_proxy.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "content/common/input/web_input_event_traits.h" 10 #include "content/common/input/web_input_event_traits.h"
11 #include "content/renderer/input/input_handler_proxy_client.h" 11 #include "content/renderer/input/input_handler_proxy_client.h"
12 #include "third_party/WebKit/public/platform/Platform.h" 12 #include "third_party/WebKit/public/platform/Platform.h"
13 #include "third_party/WebKit/public/web/WebInputEvent.h" 13 #include "third_party/WebKit/public/web/WebInputEvent.h"
14 #include "ui/events/latency_info.h" 14 #include "ui/events/latency_info.h"
15 #include "ui/gfx/frame_time.h" 15 #include "ui/gfx/frame_time.h"
16 #include "ui/gfx/geometry/point_conversions.h"
16 17
17 using blink::WebFloatPoint; 18 using blink::WebFloatPoint;
18 using blink::WebFloatSize; 19 using blink::WebFloatSize;
19 using blink::WebGestureEvent; 20 using blink::WebGestureEvent;
20 using blink::WebInputEvent; 21 using blink::WebInputEvent;
21 using blink::WebMouseEvent; 22 using blink::WebMouseEvent;
22 using blink::WebMouseWheelEvent; 23 using blink::WebMouseWheelEvent;
23 using blink::WebPoint; 24 using blink::WebPoint;
24 using blink::WebTouchEvent; 25 using blink::WebTouchEvent;
25 using blink::WebTouchPoint; 26 using blink::WebTouchPoint;
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 return DID_HANDLE; 225 return DID_HANDLE;
225 else if (!fling_may_be_active_on_main_thread_) 226 else if (!fling_may_be_active_on_main_thread_)
226 return DROP_EVENT; 227 return DROP_EVENT;
227 } else if (event.type == WebInputEvent::TouchStart) { 228 } else if (event.type == WebInputEvent::TouchStart) {
228 const WebTouchEvent& touch_event = 229 const WebTouchEvent& touch_event =
229 *static_cast<const WebTouchEvent*>(&event); 230 *static_cast<const WebTouchEvent*>(&event);
230 for (size_t i = 0; i < touch_event.touchesLength; ++i) { 231 for (size_t i = 0; i < touch_event.touchesLength; ++i) {
231 if (touch_event.touches[i].state != WebTouchPoint::StatePressed) 232 if (touch_event.touches[i].state != WebTouchPoint::StatePressed)
232 continue; 233 continue;
233 if (input_handler_->HaveTouchEventHandlersAt( 234 if (input_handler_->HaveTouchEventHandlersAt(
234 blink::WebPoint(touch_event.touches[i].position.x, 235 gfx::ToFlooredPoint(touch_event.touches[i].position))) {
jdduke (slow) 2014/03/20 12:11:34 Hmm, this may be a small change in behavior. Prev
tdresser 2014/03/20 14:09:14 Done. I'm not convinced it really makes sense to
235 touch_event.touches[i].position.y))) {
236 return DID_NOT_HANDLE; 236 return DID_NOT_HANDLE;
237 } 237 }
238 } 238 }
239 return DROP_EVENT; 239 return DROP_EVENT;
240 } else if (WebInputEvent::isKeyboardEventType(event.type)) { 240 } else if (WebInputEvent::isKeyboardEventType(event.type)) {
241 CancelCurrentFling(true); 241 CancelCurrentFling(true);
242 } else if (event.type == WebInputEvent::MouseMove) { 242 } else if (event.type == WebInputEvent::MouseMove) {
243 const WebMouseEvent& mouse_event = 243 const WebMouseEvent& mouse_event =
244 *static_cast<const WebMouseEvent*>(&event); 244 *static_cast<const WebMouseEvent*>(&event);
245 // TODO(tony): Ignore when mouse buttons are down? 245 // TODO(tony): Ignore when mouse buttons are down?
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 TRACE_EVENT2("input", 489 TRACE_EVENT2("input",
490 "InputHandlerProxy::notifyCurrentFlingVelocity", 490 "InputHandlerProxy::notifyCurrentFlingVelocity",
491 "vx", 491 "vx",
492 velocity.width, 492 velocity.width,
493 "vy", 493 "vy",
494 velocity.height); 494 velocity.height);
495 input_handler_->NotifyCurrentFlingVelocity(ToClientScrollIncrement(velocity)); 495 input_handler_->NotifyCurrentFlingVelocity(ToClientScrollIncrement(velocity));
496 } 496 }
497 497
498 } // namespace content 498 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698