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/v8/V8DOMWrapper.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/v8/V8DOMWrapper.cpp')
| -rw-r--r-- | WebCore/bindings/v8/V8DOMWrapper.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp index 7ecc29c..a31c5bd 100644 --- a/WebCore/bindings/v8/V8DOMWrapper.cpp +++ b/WebCore/bindings/v8/V8DOMWrapper.cpp @@ -1541,20 +1541,12 @@ PassRefPtr<EventListener> V8DOMWrapper::getEventListener(Node* node, v8::Local<v return (lookup == ListenerFindOnly) ? V8EventListenerList::findWrapper(value, isAttribute) : V8EventListenerList::findOrCreateWrapper<V8EventListener>(value, isAttribute); } -<<<<<<< HEAD:WebCore/bindings/v8/V8DOMWrapper.cpp -#if PLATFORM(ANDROID) -======= ->>>>>>> webkit.org at r51976:WebCore/bindings/v8/V8DOMWrapper.cpp #if ENABLE(SVG) PassRefPtr<EventListener> V8DOMWrapper::getEventListener(SVGElementInstance* element, v8::Local<v8::Value> value, bool isAttribute, ListenerLookupType lookup) { return getEventListener(element->correspondingElement(), value, isAttribute, lookup); } #endif -<<<<<<< HEAD:WebCore/bindings/v8/V8DOMWrapper.cpp -#endif -======= ->>>>>>> webkit.org at r51976:WebCore/bindings/v8/V8DOMWrapper.cpp PassRefPtr<EventListener> V8DOMWrapper::getEventListener(AbstractWorker* worker, v8::Local<v8::Value> value, bool isAttribute, ListenerLookupType lookup) { |