projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
content
/
browser
/
renderer_host
/
ui_events_helper.cc
diff --git
a/src/content/browser/renderer_host/ui_events_helper.cc
b/src/content/browser/renderer_host/ui_events_helper.cc
index
8c2a9a9
..
00bc2f3
100644
(file)
--- a/
src/content/browser/renderer_host/ui_events_helper.cc
+++ b/
src/content/browser/renderer_host/ui_events_helper.cc
@@
-4,6
+4,7
@@
#include "content/browser/renderer_host/ui_events_helper.h"
#include "content/browser/renderer_host/ui_events_helper.h"
+#include "content/common/input/web_touch_event_traits.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
#include "ui/events/event.h"
#include "ui/events/event_constants.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
#include "ui/events/event.h"
#include "ui/events/event_constants.h"
@@
-325,8
+326,9
@@
blink::WebTouchPoint* UpdateWebTouchEventFromUIEvent(
}
// Update the type of the touch event.
}
// Update the type of the touch event.
- web_event->type = TouchEventTypeFromEvent(event);
- web_event->timeStampSeconds = event.time_stamp().InSecondsF();
+ WebTouchEventTraits::ResetType(TouchEventTypeFromEvent(event),
+ event.time_stamp().InSecondsF(),
+ web_event);
web_event->modifiers = EventFlagsToWebEventModifiers(event.flags());
return point;
web_event->modifiers = EventFlagsToWebEventModifiers(event.flags());
return point;