diff options
| author | Steve Block <steveblock@google.com> | 2010-01-27 07:11:46 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-27 07:11:46 -0800 |
| commit | ed2f5b0c199158ed3dc87410b9cb5cb89964f6c3 (patch) | |
| tree | b7181718b5e0b948b06c54163b779d36c18a3169 /WebCore/page | |
| parent | 64c9428d353a66b30f83ad117c2160f3f3d3e5f3 (diff) | |
| parent | ab044252fb75e12a22d01119972999c6c28cf147 (diff) | |
| download | external_webkit-ed2f5b0c199158ed3dc87410b9cb5cb89964f6c3.zip external_webkit-ed2f5b0c199158ed3dc87410b9cb5cb89964f6c3.tar.gz external_webkit-ed2f5b0c199158ed3dc87410b9cb5cb89964f6c3.tar.bz2 | |
Merge changes I0ab68eac,Ide43a042,I0c11519b,I1ef80088
* changes:
Update Android to reflect final version submitted to webkit.org for ScriptController
Update Android to reflect final version submitted to webkit.org for touch events.
Update Android to reflect final version submitted to webkit.org for V8 TODOs
Update Android to reflect final version submitted to webkit.org for adding NetworkStateNotifier::networkStateChange
Diffstat (limited to 'WebCore/page')
| -rw-r--r-- | WebCore/page/DOMWindow.idl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/page/DOMWindow.idl b/WebCore/page/DOMWindow.idl index cfc9401..71d7ca4 100644 --- a/WebCore/page/DOMWindow.idl +++ b/WebCore/page/DOMWindow.idl @@ -290,12 +290,12 @@ module window { #if defined(ENABLE_ORIENTATION_EVENTS) && ENABLE_ORIENTATION_EVENTS attribute EventListener onorientationchange; #endif -#if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS + #if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS attribute [DontEnum] EventListener ontouchstart; attribute [DontEnum] EventListener ontouchmove; attribute [DontEnum] EventListener ontouchend; attribute [DontEnum] EventListener ontouchcancel; -#endif + #endif // EventTarget interface [Custom] void addEventListener(in DOMString type, |