diff options
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()) |