diff options
| author | Andrei Popescu <andreip@google.com> | 2010-01-25 03:38:47 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-25 03:38:47 -0800 |
| commit | ce6ac5bde4fdfba3f020e3dc8264f0416160a3a8 (patch) | |
| tree | b68ea428eb69ec61c05aff99ffaa96d0d2d94095 | |
| parent | 6ea14fae517da56092ed519906404da3127e10c0 (diff) | |
| parent | e32305bf10f1988b700ed0b330314e8671d50742 (diff) | |
| download | external_webkit-ce6ac5bde4fdfba3f020e3dc8264f0416160a3a8.zip external_webkit-ce6ac5bde4fdfba3f020e3dc8264f0416160a3a8.tar.gz external_webkit-ce6ac5bde4fdfba3f020e3dc8264f0416160a3a8.tar.bz2 | |
Merge "Remove Android-specific TODOs as the changes have been upstreamed in"
| -rw-r--r-- | WebCore/bindings/v8/V8DOMWrapper.cpp | 9 | ||||
| -rw-r--r-- | WebCore/bindings/v8/V8DOMWrapper.h | 3 |
2 files changed, 0 insertions, 12 deletions
diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp index 6a691a9..28b316a 100644 --- a/WebCore/bindings/v8/V8DOMWrapper.cpp +++ b/WebCore/bindings/v8/V8DOMWrapper.cpp @@ -32,18 +32,11 @@ #include "V8DOMWrapper.h" #include "CSSMutableStyleDeclaration.h" -// ANDROID: Upstream CHROMIUM guard. -#if PLATFORM(CHROMIUM) -#include "ChromiumBridge.h" -#endif #include "DOMObjectsInclude.h" #include "DocumentLoader.h" #include "FrameLoaderClient.h" #include "Notification.h" -// ANDROID: Upstream SVG guard. -#if ENABLE(SVG) #include "SVGElementInstance.h" -#endif #include "ScriptController.h" #include "V8AbstractEventListener.h" #include "V8Binding.h" @@ -592,13 +585,11 @@ v8::Persistent<v8::FunctionTemplate> V8DOMWrapper::getTemplate(V8ClassIndex::V8W instanceTemplate->SetInternalFieldCount(V8Custom::kXMLHttpRequestInternalFieldCount); break; } -// ANDROID: Upstream XPATH guard. #if ENABLE(XPATH) case V8ClassIndex::XPATHEVALUATOR: descriptor->SetCallHandler(USE_CALLBACK(XPathEvaluatorConstructor)); break; #endif -// ANDROID: Upstream XSLT guard. #if ENABLE(XSLT) case V8ClassIndex::XSLTPROCESSOR: descriptor->SetCallHandler(USE_CALLBACK(XSLTProcessorConstructor)); diff --git a/WebCore/bindings/v8/V8DOMWrapper.h b/WebCore/bindings/v8/V8DOMWrapper.h index 660b827..2761100 100644 --- a/WebCore/bindings/v8/V8DOMWrapper.h +++ b/WebCore/bindings/v8/V8DOMWrapper.h @@ -242,8 +242,6 @@ 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, V8Proxy* proxy = 0) @@ -256,7 +254,6 @@ namespace WebCore { 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 |