| 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 1a157c806de383da736a658c13f382cd488c0739..ad7c1b5545b7be1294d0397681c0cbac74698cbc 100644
|
| --- a/third_party/WebKit/Source/web/WebInputEventConversion.h
|
| +++ b/third_party/WebKit/Source/web/WebInputEventConversion.h
|
| @@ -37,6 +37,8 @@
|
| #include "platform/PlatformTouchEvent.h"
|
| #include "platform/PlatformWheelEvent.h"
|
| #include "public/web/WebInputEvent.h"
|
| +#include "web/WebExport.h"
|
| +#include "wtf/Compiler.h"
|
|
|
| namespace blink {
|
|
|
| @@ -56,22 +58,22 @@ class Widget;
|
| // These classes are used to convert from WebInputEvent subclasses to
|
| // corresponding WebCore events.
|
|
|
| -class PlatformMouseEventBuilder : public PlatformMouseEvent {
|
| +class WEB_EXPORT PlatformMouseEventBuilder : WTF_NON_EXPORTED_BASE(public PlatformMouseEvent) {
|
| public:
|
| PlatformMouseEventBuilder(Widget*, const WebMouseEvent&);
|
| };
|
|
|
| -class PlatformWheelEventBuilder : public PlatformWheelEvent {
|
| +class WEB_EXPORT PlatformWheelEventBuilder : WTF_NON_EXPORTED_BASE(public PlatformWheelEvent) {
|
| public:
|
| PlatformWheelEventBuilder(Widget*, const WebMouseWheelEvent&);
|
| };
|
|
|
| -class PlatformGestureEventBuilder : public PlatformGestureEvent {
|
| +class WEB_EXPORT PlatformGestureEventBuilder : WTF_NON_EXPORTED_BASE(public PlatformGestureEvent) {
|
| public:
|
| PlatformGestureEventBuilder(Widget*, const WebGestureEvent&);
|
| };
|
|
|
| -class PlatformKeyboardEventBuilder : public PlatformKeyboardEvent {
|
| +class WEB_EXPORT PlatformKeyboardEventBuilder : WTF_NON_EXPORTED_BASE(public PlatformKeyboardEvent) {
|
| public:
|
| PlatformKeyboardEventBuilder(const WebKeyboardEvent&);
|
| void setKeyType(EventType);
|
| @@ -79,18 +81,18 @@ public:
|
| };
|
|
|
| // Converts a WebTouchPoint to a PlatformTouchPoint.
|
| -class PlatformTouchPointBuilder : public PlatformTouchPoint {
|
| +class WEB_EXPORT PlatformTouchPointBuilder : WTF_NON_EXPORTED_BASE(public PlatformTouchPoint) {
|
| public:
|
| PlatformTouchPointBuilder(Widget*, const WebTouchPoint&);
|
| };
|
|
|
| // Converts a WebTouchEvent to a PlatformTouchEvent.
|
| -class PlatformTouchEventBuilder : public PlatformTouchEvent {
|
| +class WEB_EXPORT PlatformTouchEventBuilder : WTF_NON_EXPORTED_BASE(public PlatformTouchEvent) {
|
| public:
|
| PlatformTouchEventBuilder(Widget*, const WebTouchEvent&);
|
| };
|
|
|
| -class WebMouseEventBuilder : public WebMouseEvent {
|
| +class WEB_EXPORT WebMouseEventBuilder : WTF_NON_EXPORTED_BASE(public WebMouseEvent) {
|
| public:
|
| // Converts a MouseEvent to a corresponding WebMouseEvent.
|
| // NOTE: This is only implemented for mousemove, mouseover, mouseout,
|
| @@ -102,7 +104,7 @@ public:
|
|
|
| // Converts a WheelEvent to a corresponding WebMouseWheelEvent.
|
| // If the event mapping fails, the event type will be set to Undefined.
|
| -class WebMouseWheelEventBuilder : public WebMouseWheelEvent {
|
| +class WEB_EXPORT WebMouseWheelEventBuilder : WTF_NON_EXPORTED_BASE(public WebMouseWheelEvent) {
|
| public:
|
| WebMouseWheelEventBuilder(const Widget*, const LayoutObject*, const WheelEvent&);
|
| };
|
| @@ -112,7 +114,7 @@ public:
|
| // NOTE: For KeyboardEvent, this is only implemented for keydown,
|
| // keyup, and keypress. If the event mapping fails, the event type will be set
|
| // to Undefined.
|
| -class WebKeyboardEventBuilder : public WebKeyboardEvent {
|
| +class WEB_EXPORT WebKeyboardEventBuilder : WTF_NON_EXPORTED_BASE(public WebKeyboardEvent) {
|
| public:
|
| WebKeyboardEventBuilder(const KeyboardEvent&);
|
| };
|
| @@ -120,14 +122,14 @@ public:
|
| // Converts a TouchEvent to a corresponding WebTouchEvent.
|
| // NOTE: WebTouchEvents have a cap on the number of WebTouchPoints. Any points
|
| // exceeding that cap will be dropped.
|
| -class WebTouchEventBuilder : public WebTouchEvent {
|
| +class WEB_EXPORT WebTouchEventBuilder : WTF_NON_EXPORTED_BASE(public WebTouchEvent) {
|
| public:
|
| WebTouchEventBuilder(const LayoutObject*, const TouchEvent&);
|
| };
|
|
|
| // Converts GestureEvent to a corresponding WebGestureEvent.
|
| // NOTE: If event mapping fails, the type will be set to Undefined.
|
| -class WebGestureEventBuilder : public WebGestureEvent {
|
| +class WEB_EXPORT WebGestureEventBuilder : WTF_NON_EXPORTED_BASE(public WebGestureEvent) {
|
| public:
|
| WebGestureEventBuilder(const LayoutObject*, const GestureEvent&);
|
| };
|
|
|