diff options
| author | Andrei Popescu <andreip@google.com> | 2010-01-22 15:14:56 +0000 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2010-01-22 15:14:56 +0000 |
| commit | e32305bf10f1988b700ed0b330314e8671d50742 (patch) | |
| tree | a6d807d98b3f1b3fc0053ee6c9a82f0d43af6b05 | |
| parent | 488dcd54e257a3a18d92e5ec1897511dfb05482c (diff) | |
| download | external_webkit-e32305bf10f1988b700ed0b330314e8671d50742.zip external_webkit-e32305bf10f1988b700ed0b330314e8671d50742.tar.gz external_webkit-e32305bf10f1988b700ed0b330314e8671d50742.tar.bz2 | |
Remove Android-specific TODOs as the changes have been upstreamed in
https://bugs.webkit.org/show_bug.cgi?id=33944
| -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 |