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

Unified Diff: third_party/WebKit/Source/core/events/TouchEvent.h

Issue 2844823002: Support Coalesced Touch in ppapi (Closed)
Patch Set: Support Coalesced Touch in ppapi Created 3 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/events/TouchEvent.h
diff --git a/third_party/WebKit/Source/core/events/TouchEvent.h b/third_party/WebKit/Source/core/events/TouchEvent.h
index dd88224d105fac6cb39f7497e3c5250e7fa657ef..e59a952906482d58df306ebdd03a9e36f94c36e5 100644
--- a/third_party/WebKit/Source/core/events/TouchEvent.h
+++ b/third_party/WebKit/Source/core/events/TouchEvent.h
@@ -32,6 +32,7 @@
#include "core/events/EventDispatchMediator.h"
#include "core/events/TouchEventInit.h"
#include "core/events/UIEventWithKeyState.h"
+#include "public/platform/WebCoalescedInputEvent.h"
#include "public/platform/WebTouchEvent.h"
namespace blink {
@@ -45,7 +46,7 @@ class CORE_EXPORT TouchEvent final : public UIEventWithKeyState {
// We only initialize sourceCapabilities when we create TouchEvent from
// EventHandler, null if it is from JavaScript.
static TouchEvent* Create() { return new TouchEvent; }
- static TouchEvent* Create(const WebTouchEvent& event,
+ static TouchEvent* Create(const WebCoalescedInputEvent& event,
TouchList* touches,
TouchList* target_touches,
TouchList* changed_touches,
@@ -83,13 +84,15 @@ class CORE_EXPORT TouchEvent final : public UIEventWithKeyState {
EventDispatchMediator* CreateMediator() override;
- const WebTouchEvent* NativeEvent() const { return native_event_.get(); }
+ const WebCoalescedInputEvent* NativeEvent() const {
+ return native_event_.get();
+ }
DECLARE_VIRTUAL_TRACE();
private:
TouchEvent();
- TouchEvent(const WebTouchEvent&,
+ TouchEvent(const WebCoalescedInputEvent&,
TouchList* touches,
TouchList* target_touches,
TouchList* changed_touches,
@@ -109,7 +112,7 @@ class CORE_EXPORT TouchEvent final : public UIEventWithKeyState {
// touchstart event is generated. It is used for UMA histograms.
TouchAction current_touch_action_;
- std::unique_ptr<WebTouchEvent> native_event_;
+ std::unique_ptr<WebCoalescedInputEvent> native_event_;
};
class TouchEventDispatchMediator final : public EventDispatchMediator {

Powered by Google App Engine
This is Rietveld 408576698