| Index: third_party/WebKit/Source/web/WebInputEventConversion.h
|
| diff --git a/third_party/WebKit/Source/web/WebInputEventConversion.h b/third_party/WebKit/Source/web/WebInputEventConversion.h
|
| index cadbb14bd76c3c4cd8264c927dc5816022da3837..4a9272b12b5526ec5445d8c1fbbca8cb43e53743 100644
|
| --- a/third_party/WebKit/Source/web/WebInputEventConversion.h
|
| +++ b/third_party/WebKit/Source/web/WebInputEventConversion.h
|
| @@ -31,11 +31,10 @@
|
| #ifndef WebInputEventConversion_h
|
| #define WebInputEventConversion_h
|
|
|
| -#include "platform/PlatformGestureEvent.h"
|
| #include "platform/PlatformMouseEvent.h"
|
| #include "platform/PlatformTouchEvent.h"
|
| #include "platform/PlatformWheelEvent.h"
|
| -#include "public/platform/WebGestureEvent.h"
|
| +#include "platform/scroll/ScrollTypes.h"
|
| #include "public/platform/WebInputEvent.h"
|
| #include "web/WebExport.h"
|
| #include "wtf/Compiler.h"
|
| @@ -43,7 +42,6 @@
|
|
|
| namespace blink {
|
|
|
| -class GestureEvent;
|
| class KeyboardEvent;
|
| class MouseEvent;
|
| class LayoutItem;
|
| @@ -52,7 +50,6 @@ class WebMouseEvent;
|
| class WebMouseWheelEvent;
|
| class WebKeyboardEvent;
|
| class WebTouchEvent;
|
| -class WebGestureEvent;
|
| class WheelEvent;
|
| class Widget;
|
|
|
| @@ -71,12 +68,6 @@ class WEB_EXPORT PlatformWheelEventBuilder
|
| PlatformWheelEventBuilder(Widget*, const WebMouseWheelEvent&);
|
| };
|
|
|
| -class WEB_EXPORT PlatformGestureEventBuilder
|
| - : NON_EXPORTED_BASE(public PlatformGestureEvent) {
|
| - public:
|
| - PlatformGestureEventBuilder(Widget*, const WebGestureEvent&);
|
| -};
|
| -
|
| // Converts a WebTouchPoint to a PlatformTouchPoint.
|
| class WEB_EXPORT PlatformTouchPointBuilder
|
| : NON_EXPORTED_BASE(public PlatformTouchPoint) {
|
| @@ -129,13 +120,8 @@ class WEB_EXPORT WebTouchEventBuilder
|
| WebTouchEventBuilder(const LayoutItem, const TouchEvent&);
|
| };
|
|
|
| -// Converts GestureEvent to a corresponding WebGestureEvent.
|
| -// NOTE: If event mapping fails, the type will be set to Undefined.
|
| -class WEB_EXPORT WebGestureEventBuilder
|
| - : NON_EXPORTED_BASE(public WebGestureEvent) {
|
| - public:
|
| - WebGestureEventBuilder(const LayoutItem, const GestureEvent&);
|
| -};
|
| +WEB_EXPORT WebGestureEvent ScaleWebGestureEvent(Widget*,
|
| + const WebGestureEvent&);
|
|
|
| Vector<PlatformMouseEvent> WEB_EXPORT
|
| createPlatformMouseEventVector(Widget*,
|
|
|