diff options
| -rw-r--r-- | WebCore/WebCore.gypi | 3 | ||||
| -rw-r--r-- | WebCore/bindings/v8/DOMObjectsInclude.h | 12 | ||||
| -rw-r--r-- | WebCore/bindings/v8/DerivedSourcesAllInOne.cpp | 3 | ||||
| -rw-r--r-- | WebCore/bindings/v8/V8Index.h | 12 | ||||
| -rw-r--r-- | WebCore/bindings/v8/custom/V8EventCustom.cpp | 3 |
5 files changed, 18 insertions, 15 deletions
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi index 22b6117..63edea7 100644 --- a/WebCore/WebCore.gypi +++ b/WebCore/WebCore.gypi @@ -73,6 +73,9 @@ 'dom/RangeException.idl', 'dom/Text.idl', 'dom/TextEvent.idl', + 'dom/Touch.idl', + 'dom/TouchEvent.idl', + 'dom/TouchList.idl', 'dom/TreeWalker.idl', 'dom/UIEvent.idl', 'dom/WebKitAnimationEvent.idl', diff --git a/WebCore/bindings/v8/DOMObjectsInclude.h b/WebCore/bindings/v8/DOMObjectsInclude.h index 8f1b43d..6cffa27 100644 --- a/WebCore/bindings/v8/DOMObjectsInclude.h +++ b/WebCore/bindings/v8/DOMObjectsInclude.h @@ -243,12 +243,6 @@ #if PLATFORM(ANDROID) #include "Connection.h" -// TODO: Upstream TOUCH_EVENTS guard. -#if ENABLE(TOUCH_EVENTS) -#include "Touch.h" -#include "TouchList.h" -#include "TouchEvent.h" -#endif #endif #if ENABLE(WEB_SOCKETS) @@ -292,6 +286,12 @@ #include "InspectorFrontendHost.h" #endif // INSPECTOR +#if ENABLE(TOUCH_EVENTS) +#include "Touch.h" +#include "TouchEvent.h" +#include "TouchList.h" +#endif + namespace WebCore { // A helper class for undetectable document.all diff --git a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp index 9658b19..b626499 100644 --- a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp +++ b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp @@ -219,6 +219,9 @@ #include "bindings/V8TextEvent.cpp" #include "bindings/V8TextMetrics.cpp" #include "bindings/V8TimeRanges.cpp" +#include "bindings/V8Touch.cpp" +#include "bindings/V8TouchEvent.cpp" +#include "bindings/V8TouchList.cpp" #include "bindings/V8TreeWalker.cpp" #include "bindings/V8UIEvent.cpp" #include "bindings/V8ValidityState.cpp" diff --git a/WebCore/bindings/v8/V8Index.h b/WebCore/bindings/v8/V8Index.h index bd1c45c..e5521bb 100644 --- a/WebCore/bindings/v8/V8Index.h +++ b/WebCore/bindings/v8/V8Index.h @@ -526,24 +526,24 @@ static const int v8DefaultWrapperInternalFieldCount = 2; V(GEOPOSITION, Geoposition) \ V(POSITIONERROR, PositionError) -#if PLATFORM(ANDROID) -// TODO: Upstream this guard. #if ENABLE(TOUCH_EVENTS) #define DOM_OBJECT_TOUCH_EVENT_TYPES(V) \ - V(TOUCHLIST, TouchList) \ - V(TOUCHEVENT, TouchEvent) \ V(TOUCH, Touch) + V(TOUCHEVENT, TouchEvent) \ + V(TOUCHLIST, TouchList) \ #else #define DOM_OBJECT_TOUCH_EVENT_TYPES(V) #endif + +#if PLATFORM(ANDROID) #define DOM_OBJECT_CONNECTION_TYPES(V) \ V(CONNECTION, Connection) -#endif -#if PLATFORM(ANDROID) #define DOM_OBJECT_VOIDCALLBACK_TYPES(V) \ V(VOIDCALLBACK, VoidCallback) #else +// We don't plan to upstream CONNECTION as it's only temporary, so we +// don't need a default here. #define DOM_OBJECT_VOIDCALLBACK_TYPES(V) #endif diff --git a/WebCore/bindings/v8/custom/V8EventCustom.cpp b/WebCore/bindings/v8/custom/V8EventCustom.cpp index 2a5049b..79bddc0 100644 --- a/WebCore/bindings/v8/custom/V8EventCustom.cpp +++ b/WebCore/bindings/v8/custom/V8EventCustom.cpp @@ -105,13 +105,10 @@ v8::Handle<v8::Value> toV8(Event* impl) #endif if (impl->isCompositionEvent()) return toV8(static_cast<CompositionEvent*>(impl)); -#if PLATFORM(ANDROID) -// TODO(benm): upstream this to webkit.org #if ENABLE(TOUCH_EVENTS) if (impl->isTouchEvent()) return toV8(static_cast<TouchEvent*>(impl)); #endif -#endif return toV8(static_cast<UIEvent*>(impl)); } if (impl->isMutationEvent()) |