From 2fb528f4cf4b88d350947cec509672a40d1aa9fb Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Tue, 15 Dec 2009 15:45:02 +0000
Subject: [PATCH] Adds notes to upstream feature guards added in
 V8DOMWrapper.cpp.

Change-Id: Id7659cfcab17f24e48958086b4206b1906562d74
---
 WebCore/bindings/v8/V8DOMWrapper.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp
index a31c5bdc3..6a691a946 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
-- 
2.11.0