diff options
| author | Steve Block <steveblock@google.com> | 2009-10-13 22:43:52 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:45:09 +0100 |
| commit | 86cfdd09c85781ba25861c20984629b3b5fefa0d (patch) | |
| tree | 9b129b02e1f5bda0241e797b743f00d21337763b /WebCore/bindings | |
| parent | e2bca94a6deb58613400a85282dea37566fff097 (diff) | |
| download | external_webkit-86cfdd09c85781ba25861c20984629b3b5fefa0d.zip external_webkit-86cfdd09c85781ba25861c20984629b3b5fefa0d.tar.gz external_webkit-86cfdd09c85781ba25861c20984629b3b5fefa0d.tar.bz2 | |
Merge webkit.org at R49305 : Add ifdefs for enabler flags for V8 on Android.
Change-Id: Ia05aafa843b1f9aaf3d4f43cad7d664bf9d497e6
Diffstat (limited to 'WebCore/bindings')
| -rw-r--r-- | WebCore/bindings/v8/DerivedSourcesAllInOne.cpp | 5 | ||||
| -rw-r--r-- | WebCore/bindings/v8/V8DOMWrapper.cpp | 9 | ||||
| -rw-r--r-- | WebCore/bindings/v8/V8DOMWrapper.h | 5 |
3 files changed, 19 insertions, 0 deletions
diff --git a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp index b7c6132..7fd865c 100644 --- a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp +++ b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp @@ -192,8 +192,13 @@ #include "bindings/V8NodeIterator.cpp" #include "bindings/V8NodeList.cpp" #include "bindings/V8Notation.cpp" +#if PLATFORM(ANDROID) +// TODO: Upstream NOTIFICATIONS guard. +#if ENABLE(NOTIFICATIONS) #include "bindings/V8Notification.cpp" #include "bindings/V8NotificationCenter.cpp" +#endif +#endif #include "bindings/V8OverflowEvent.cpp" #include "bindings/V8PageTransitionEvent.cpp" #include "bindings/V8Plugin.cpp" diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp index 4b0e895..5a6b901 100644 --- a/WebCore/bindings/v8/V8DOMWrapper.cpp +++ b/WebCore/bindings/v8/V8DOMWrapper.cpp @@ -39,7 +39,12 @@ #include "DocumentLoader.h" #include "FrameLoaderClient.h" #include "Notification.h" +#if PLATFORM(ANDROID) +// TODO: Upstream SVG guard. +#if ENABLE(SVG) #include "SVGElementInstance.h" +#endif +#endif #include "ScriptController.h" #include "V8AbstractEventListener.h" #include "V8Binding.h" @@ -1423,10 +1428,14 @@ PassRefPtr<EventListener> V8DOMWrapper::getEventListener(Node* node, v8::Local<v return 0; } +#if PLATFORM(ANDROID) +#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 +#endif PassRefPtr<EventListener> V8DOMWrapper::getEventListener(AbstractWorker* worker, v8::Local<v8::Value> value, bool isAttribute, ListenerLookupType lookup) { diff --git a/WebCore/bindings/v8/V8DOMWrapper.h b/WebCore/bindings/v8/V8DOMWrapper.h index 2257688..b5587d5 100644 --- a/WebCore/bindings/v8/V8DOMWrapper.h +++ b/WebCore/bindings/v8/V8DOMWrapper.h @@ -242,6 +242,9 @@ namespace WebCore { static PassRefPtr<EventListener> getEventListener(V8Proxy* proxy, v8::Local<v8::Value> value, bool isAttribute, ListenerLookupType lookup); +#if PLATFORM(ANDROID) +// TODO: upstream XPATH guard. +#if ENABLE(XPATH) // XPath-related utilities static RefPtr<XPathNSResolver> getXPathNSResolver(v8::Handle<v8::Value> value) { @@ -252,6 +255,8 @@ namespace WebCore { resolver = V8CustomXPathNSResolver::create(value->ToObject()); return resolver; } +#endif +#endif // DOMImplementation is a singleton and it is handled in a special // way. A wrapper is generated per document and stored in an |