diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 10:20:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 10:20:49 -0800 |
| commit | 6ddddda63fdb2acedd17e06029f8cb5377fb9476 (patch) | |
| tree | 765ea02b14799a2f6c460aa5b47d0eac5b646d87 /WebCore | |
| parent | e2592c10dc1e17cb92b325fb91c4adf59ee8a2c1 (diff) | |
| parent | 2427cd61fec29b72e27eb037ca0c6c57cb4ad66c (diff) | |
| download | external_webkit-6ddddda63fdb2acedd17e06029f8cb5377fb9476.zip external_webkit-6ddddda63fdb2acedd17e06029f8cb5377fb9476.tar.gz external_webkit-6ddddda63fdb2acedd17e06029f8cb5377fb9476.tar.bz2 | |
am 2427cd61: am 2fb528f4: Adds notes to upstream feature guards added in V8DOMWrapper.cpp.
Merge commit '2427cd61fec29b72e27eb037ca0c6c57cb4ad66c'
* commit '2427cd61fec29b72e27eb037ca0c6c57cb4ad66c':
Adds notes to upstream feature guards added in V8DOMWrapper.cpp.
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/bindings/v8/V8DOMWrapper.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp index a31c5bd..6a691a9 100644 --- a/WebCore/bindings/v8/V8DOMWrapper.cpp +++ b/WebCore/bindings/v8/V8DOMWrapper.cpp @@ -32,6 +32,7 @@ #include "V8DOMWrapper.h" #include "CSSMutableStyleDeclaration.h" +// ANDROID: Upstream CHROMIUM guard. #if PLATFORM(CHROMIUM) #include "ChromiumBridge.h" #endif @@ -39,12 +40,10 @@ #include "DocumentLoader.h" #include "FrameLoaderClient.h" #include "Notification.h" -#if PLATFORM(ANDROID) -// TODO: Upstream SVG guard. +// ANDROID: Upstream SVG guard. #if ENABLE(SVG) #include "SVGElementInstance.h" #endif -#endif #include "ScriptController.h" #include "V8AbstractEventListener.h" #include "V8Binding.h" @@ -593,18 +592,20 @@ 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)); break; #endif +// ANDROID: Upstream TOUCH_EVENTS. #if ENABLE(TOUCH_EVENTS) - // TODO(andreip): upstream touch related changes to Chromium case V8ClassIndex::TOUCHLIST: { v8::Local<v8::ObjectTemplate> instanceTemplate = descriptor->InstanceTemplate(); instanceTemplate->SetIndexedPropertyHandler(USE_INDEXED_PROPERTY_GETTER(TouchList)); @@ -1261,8 +1262,8 @@ v8::Handle<v8::Value> V8DOMWrapper::convertEventToV8Object(Event* event) type = V8ClassIndex::MOUSEEVENT; else if (event->isWheelEvent()) type = V8ClassIndex::WHEELEVENT; +// ANDROID: Upstream TOUCH_EVENTS. #if ENABLE(TOUCH_EVENTS) - // TODO(andreip): upstream touch related changes to WebKit else if (event->isTouchEvent()) type = V8ClassIndex::TOUCHEVENT; #endif |