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

Side by Side Diff: content/browser/renderer_host/ui_events_helper.cc

Issue 1975533002: Change ui::Event::time_stamp from TimeDelta to TimeTicks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updates Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui_events_helper.h" 5 #include "content/browser/renderer_host/ui_events_helper.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "content/browser/renderer_host/input/web_input_event_util.h" 9 #include "content/browser/renderer_host/input/web_input_event_util.h"
10 #include "content/common/input/web_touch_event_traits.h" 10 #include "content/common/input/web_touch_event_traits.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 break; 57 break;
58 case blink::WebInputEvent::TouchCancel: 58 case blink::WebInputEvent::TouchCancel:
59 type = ui::ET_TOUCH_CANCELLED; 59 type = ui::ET_TOUCH_CANCELLED;
60 break; 60 break;
61 default: 61 default:
62 NOTREACHED(); 62 NOTREACHED();
63 return false; 63 return false;
64 } 64 }
65 65
66 int flags = WebEventModifiersToEventFlags(touch.modifiers); 66 int flags = WebEventModifiersToEventFlags(touch.modifiers);
67 base::TimeDelta timestamp = base::TimeDelta::FromMicroseconds( 67 base::TimeTicks timestamp =
68 static_cast<int64_t>(touch.timeStampSeconds * 1000000)); 68 base::TimeTicks() + base::TimeDelta::FromSecondsD(touch.timeStampSeconds);
69 for (unsigned i = 0; i < touch.touchesLength; ++i) { 69 for (unsigned i = 0; i < touch.touchesLength; ++i) {
70 const blink::WebTouchPoint& point = touch.touches[i]; 70 const blink::WebTouchPoint& point = touch.touches[i];
71 if (WebTouchPointStateToEventType(point.state) != type) 71 if (WebTouchPointStateToEventType(point.state) != type)
72 continue; 72 continue;
73 // ui events start in the co-ordinate space of the EventDispatcher. 73 // ui events start in the co-ordinate space of the EventDispatcher.
74 gfx::PointF location; 74 gfx::PointF location;
75 if (coordinate_system == LOCAL_COORDINATES) 75 if (coordinate_system == LOCAL_COORDINATES)
76 location = point.position; 76 location = point.position;
77 else 77 else
78 location = point.screenPosition; 78 location = point.screenPosition;
79 ui::TouchEvent* uievent = new ui::TouchEvent( 79 ui::TouchEvent* uievent = new ui::TouchEvent(
80 type, gfx::Point(), flags, point.id, timestamp, point.radiusX, 80 type, gfx::Point(), flags, point.id, timestamp, point.radiusX,
81 point.radiusY, point.rotationAngle, point.force); 81 point.radiusY, point.rotationAngle, point.force);
82 uievent->set_location_f(location); 82 uievent->set_location_f(location);
83 uievent->set_root_location_f(location); 83 uievent->set_root_location_f(location);
84 uievent->set_latency(touch_with_latency.latency); 84 uievent->set_latency(touch_with_latency.latency);
85 list->push_back(uievent); 85 list->push_back(uievent);
86 } 86 }
87 return true; 87 return true;
88 } 88 }
89 89
90 blink::WebGestureEvent MakeWebGestureEventFromUIEvent( 90 blink::WebGestureEvent MakeWebGestureEventFromUIEvent(
91 const ui::GestureEvent& event) { 91 const ui::GestureEvent& event) {
92 return ui::CreateWebGestureEvent(event.details(), event.time_stamp(), 92 return ui::CreateWebGestureEvent(event.details(), event.time_stamp(),
93 event.location_f(), event.root_location_f(), 93 event.location_f(), event.root_location_f(),
94 event.flags()); 94 event.flags());
95 } 95 }
96 96
97 } // namespace content 97 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698