diff options
| author | Ben Murdoch <benm@google.com> | 2010-02-16 06:29:39 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-16 06:29:39 -0800 |
| commit | 2537e9d4c46d3489956e945d18fd37e65f8f541e (patch) | |
| tree | 4e757d616d19d07ad8d22f5bd62be9c7fb40d1b0 /WebCore/bindings | |
| parent | 2e5a1e938add6ca3d39bb06da21fe73d7a33ac51 (diff) | |
| parent | 1f60005350357f5b696dc1bf5343fd2d7d90ff72 (diff) | |
| download | external_webkit-2537e9d4c46d3489956e945d18fd37e65f8f541e.zip external_webkit-2537e9d4c46d3489956e945d18fd37e65f8f541e.tar.gz external_webkit-2537e9d4c46d3489956e945d18fd37e65f8f541e.tar.bz2 | |
Merge "Add toV8 conversion for touch event type."
Diffstat (limited to 'WebCore/bindings')
| -rw-r--r-- | WebCore/bindings/v8/custom/V8EventCustom.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/WebCore/bindings/v8/custom/V8EventCustom.cpp b/WebCore/bindings/v8/custom/V8EventCustom.cpp index a13603e..2a5049b 100644 --- a/WebCore/bindings/v8/custom/V8EventCustom.cpp +++ b/WebCore/bindings/v8/custom/V8EventCustom.cpp @@ -51,6 +51,7 @@ #include "V8SVGZoomEvent.h" #include "V8StorageEvent.h" #include "V8TextEvent.h" +#include "V8TouchEvent.h" #include "V8UIEvent.h" #include "V8WebKitAnimationEvent.h" #include "V8WebKitTransitionEvent.h" @@ -104,6 +105,13 @@ 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()) |