diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 09:55:28 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 09:55:28 -0800 |
| commit | 4dd98cc27e25e6c3104672f50749132d2236461b (patch) | |
| tree | 01f4412526c81ec62e02d71d128ec45827a12fdc /WebCore/bindings/js/JSEventCustom.cpp | |
| parent | fadf964da75468c2c995316cea8d82d32705a7e1 (diff) | |
| parent | aad6f24e036b3740071bb995b955b18b572067b2 (diff) | |
| download | external_webkit-4dd98cc27e25e6c3104672f50749132d2236461b.zip external_webkit-4dd98cc27e25e6c3104672f50749132d2236461b.tar.gz external_webkit-4dd98cc27e25e6c3104672f50749132d2236461b.tar.bz2 | |
am aad6f24e: Merge webkit.org at r51976 : Fix general conflicts.
Merge commit 'aad6f24e036b3740071bb995b955b18b572067b2' into eclair-mr2-plus-aosp
* commit 'aad6f24e036b3740071bb995b955b18b572067b2':
Merge webkit.org at r51976 : Fix general conflicts.
Diffstat (limited to 'WebCore/bindings/js/JSEventCustom.cpp')
| -rw-r--r-- | WebCore/bindings/js/JSEventCustom.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/WebCore/bindings/js/JSEventCustom.cpp b/WebCore/bindings/js/JSEventCustom.cpp index 06b2fe5..7b951bd 100644 --- a/WebCore/bindings/js/JSEventCustom.cpp +++ b/WebCore/bindings/js/JSEventCustom.cpp @@ -116,15 +116,12 @@ JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, Event* event) else if (event->isSVGZoomEvent()) wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, SVGZoomEvent, event); #endif -<<<<<<< HEAD:WebCore/bindings/js/JSEventCustom.cpp + else if (event->isCompositionEvent()) + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CompositionEvent, event); #if ENABLE(TOUCH_EVENTS) // Android else if (event->isTouchEvent()) wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, TouchEvent, event); #endif -======= - else if (event->isCompositionEvent()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CompositionEvent, event); ->>>>>>> webkit.org at r51976:WebCore/bindings/js/JSEventCustom.cpp else wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, UIEvent, event); } else if (event->isMutationEvent()) |