diff options
| author | Ben Murdoch <benm@google.com> | 2010-02-18 06:24:39 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-18 06:24:39 -0800 |
| commit | e03a758f107563565c65a697d3e2f9f531da1758 (patch) | |
| tree | 319adf37d30520288359262614ab81a144d9b368 | |
| parent | 5e98dd6706ec46695cb71d9128ab29802241a153 (diff) | |
| parent | 4e022cc0147f87a6c54633e7f467bf4ec03fba5d (diff) | |
| download | external_webkit-e03a758f107563565c65a697d3e2f9f531da1758.zip external_webkit-e03a758f107563565c65a697d3e2f9f531da1758.tar.gz external_webkit-e03a758f107563565c65a697d3e2f9f531da1758.tar.bz2 | |
Merge "Update touch event bindings for V8 in V8Index.cpp to match what landed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=35094"
| -rw-r--r-- | WebCore/bindings/v8/V8Index.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/WebCore/bindings/v8/V8Index.cpp b/WebCore/bindings/v8/V8Index.cpp index 1053f19..19da75a 100644 --- a/WebCore/bindings/v8/V8Index.cpp +++ b/WebCore/bindings/v8/V8Index.cpp @@ -161,6 +161,9 @@ #include "V8StyleSheet.h" #include "V8Text.h" #include "V8TextEvent.h" +#include "V8Touch.h" +#include "V8TouchEvent.h" +#include "V8TouchList.h" #include "V8DOMCoreException.h" #include "V8DOMParser.h" #include "V8DOMWindow.h" @@ -464,13 +467,6 @@ #if PLATFORM(ANDROID) #include "V8Connection.h" -// TODO: Upstream these guards to webkit.org -#if ENABLE(TOUCH_EVENTS) -#include "V8Touch.h" -#include "V8TouchList.h" -#include "V8TouchEvent.h" -#endif - #include "V8VoidCallback.h" #endif // PLATFORM(ANDROID) |