Brings V8 binding ifdef changes in to line with version submitted to webkit.org

See https://bugs.webkit.org/show_bug.cgi?id=30697

$ diff ~/WebKitToT/WebKit/WebCore/bindings/v8/DOMObjectsInclude.h WebCore/bindings/v8/DOMObjectsInclude.h
36d35
< #include "CanvasActiveInfo.h"
186a186,193
> #if ENABLE(GEOLOCATION)
> #include "Coordinates.h"
> #include "Geolocation.h"
> #include "Geoposition.h"
> #include "PositionError.h"
> #include "PositionErrorCallback.h"
> #endif
>
222a230,238
> #if PLATFORM(ANDROID)
> // TODO: Upstream TOUCH_EVENTS guard.
> #if ENABLE(TOUCH_EVENTS)
> #include "Touch.h"
> #include "TouchList.h"
> #include "TouchEvent.h"
> #endif
> #endif
>

$ diff ~/WebKitToT/WebKit/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
37d36
< #include "bindings/V8CanvasActiveInfo.cpp"
100a100
> #include "bindings/V8Geolocation.cpp"
190,191d189
< #include "bindings/V8Notification.cpp"
< #include "bindings/V8NotificationCenter.cpp"
258d255
< #include "bindings/V8SharedWorkerContext.cpp"
366a364
> #include "bindings/V8SVGURIReference.cpp"
386a385,392
>
> #if PLATFORM(ANDROID)
> // TODO: Upstream NOTIFICATIONS guard.
> #if ENABLE(NOTIFICATIONS)
> #include "bindings/V8Notification.cpp"
> #include "bindings/V8NotificationCenter.cpp"
> #endif
> #endif

$ diff ~/WebKitToT/WebKit/WebCore/bindings/v8/V8Index.cpp WebCore/bindings/v8/V8Index.cpp
37d36
< #include "V8CanvasActiveInfo.h"
358a358
> #include "V8SVGURIReference.h"
392d391
< #include "V8SharedWorkerContext.h"
437a437,454
> #if PLATFORM(ANDROID)
> // TODO: Upstream these guards to webkit.org
> #if ENABLE(GEOLOCATION)
> #include "V8Coordinates.h"
> #include "V8Geolocation.h"
> #include "V8Geoposition.h"
> #include "V8PositionError.h"
> #endif
>
> #if ENABLE(TOUCH_EVENTS)
> #include "V8Touch.h"
> #include "V8TouchList.h"
> #include "V8TouchEvent.h"
> #endif
>
> #include "V8VoidCallback.h"
> #endif  // PLATFORM(ANDROID)
>

$ diff ~/WebKitToT/WebKit/WebCore/bindings/v8/V8Index.h WebCore/bindings/v8/V8Index.h
448d447
<     V(CANVASACTIVEINFO, CanvasActiveInfo)                               \
493a493,523
> #if ENABLE(GEOLOCATION)
> #define DOM_OBJECT_GEOLOCATION_TYPES(V)                                 \
>     V(COORDINATES, Coordinates)                                         \
>     V(GEOLOCATION, Geolocation)                                         \
>     V(GEOPOSITION, Geoposition)                                         \
>     V(POSITIONERROR, PositionError)
> #else
> #define DOM_OBJECT_GEOLOCATION_TYPES(V)
> #endif
>
> #if PLATFORM(ANDROID)
> // TODO: Upstream this guard.
> #if ENABLE(TOUCH_EVENTS)
> #define DOM_OBJECT_TOUCH_EVENT_TYPES(V)                                 \
>     V(TOUCHLIST, TouchList)                                             \
>     V(TOUCHEVENT, TouchEvent)                                           \
>     V(TOUCH, Touch)
> #else
> #define DOM_OBJECT_TOUCH_EVENT_TYPES(V)
> #endif
> #endif
>
> #if PLATFORM(ANDROID)
> #define DOM_OBJECT_VOIDCALLBACK_TYPES(V)                                \
>     V(VOIDCALLBACK, VoidCallback)
> #else
> #define DOM_OBJECT_VOIDCALLBACK_TYPES(V)
> #endif
>
> #if PLATFORM(ANDROID)
> // This block is modified, but is not Android-specific.
502a533,535
>     DOM_OBJECT_GEOLOCATION_TYPES(V)                                     \
>     DOM_OBJECT_TOUCH_EVENT_TYPES(V)                                     \
>     DOM_OBJECT_VOIDCALLBACK_TYPES(V)                                    \
503a537
> #endif

Change-Id: I9f515e0918417879813f2ff8d67df16db9bae754

4 files changed, 109 insertions, 119 deletions

diff --git a/WebCore/bindings/v8/DOMObjectsInclude.h b/WebCore/bindings/v8/DOMObjectsInclude.h
index ec5c466..fb7ba81 100644
--- a/WebCore/bindings/v8/DOMObjectsInclude.h
+++ b/WebCore/bindings/v8/DOMObjectsInclude.h
@@ -31,7 +31,6 @@
 #ifndef DOMObjectsInclude_h
 #define DOMObjectsInclude_h
 
-#include "AbstractWorker.h"
 #include "BarInfo.h"
 #include "BeforeLoadEvent.h"
 #include "CanvasArray.h"
@@ -76,7 +75,6 @@
 #include "CSSValueList.h"
 #include "CSSVariablesDeclaration.h"
 #include "CSSVariablesRule.h"
-#include "Database.h"
 #include "DocumentType.h"
 #include "DocumentFragment.h"
 #include "DOMCoreException.h"
@@ -137,18 +135,12 @@
 #include "ScriptExecutionContext.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
-#include "SharedWorker.h"
-#include "SharedWorkerContext.h"
-#include "SQLTransaction.h"
-#include "SQLResultSet.h"
-#include "SQLResultSetRowList.h"
 #include "StyleSheet.h"
 #include "StyleSheetList.h"
 #include "TextEvent.h"
 #include "TextMetrics.h"
 #include "TimeRanges.h"
 #include "TreeWalker.h"
-#include "XSLTProcessor.h"
 #include "V8AbstractEventListener.h"
 #include "V8CustomEventListener.h"
 #include "V8DOMWindow.h"
@@ -169,15 +161,18 @@
 #include "XMLHttpRequestProgressEvent.h"
 #include "XMLHttpRequestUpload.h"
 #include "XMLSerializer.h"
-#include "XPathException.h"
-#include "XPathExpression.h"
-#include "XPathNSResolver.h"
-#include "XPathResult.h"
 
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
 #include "DOMApplicationCache.h"
 #endif
 
+#if ENABLE(DATABASE)
+#include "Database.h"
+#include "SQLTransaction.h"
+#include "SQLResultSet.h"
+#include "SQLResultSetRowList.h"
+#endif // DATABASE
+
 #if ENABLE(DATAGRID)
 #include "DataGridColumn.h"
 #include "DataGridColumnList.h"
@@ -246,6 +241,7 @@
 #endif
 
 #if ENABLE(WORKERS)
+#include "AbstractWorker.h"
 #include "DedicatedWorkerContext.h"
 #include "Worker.h"
 #include "WorkerContext.h"
@@ -253,6 +249,11 @@
 #include "WorkerNavigator.h"
 #endif // WORKERS
 
+#if ENABLE(SHARED_WORKERS)
+#include "SharedWorker.h"
+#include "SharedWorkerContext.h"
+#endif  // SHARED_WORKERS
+
 #if ENABLE(NOTIFICATIONS)
 #include "Notification.h"
 #include "NotificationCenter.h"
@@ -260,14 +261,19 @@
 
 #if ENABLE(XPATH)
 #include "XPathEvaluator.h"
+#include "XPathException.h"
+#include "XPathExpression.h"
+#include "XPathNSResolver.h"
+#include "XPathResult.h"
 #endif // XPATH
 
-#if PLATFORM(ANDROID)
-// TODO: Upstream INSPECTOR guard.
+#if ENABLE(XSLT)
+#include "XSLTProcessor.h"
+#endif // XSLT
+
 #if ENABLE(INSPECTOR)
 #include "InspectorBackend.h"
 #endif // INSPECTOR
-#endif
 
 namespace WebCore {
 
diff --git a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
index c56a695..98832f3 100644
--- a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
+++ b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
@@ -28,11 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if PLATFORM(ANDROID)
 // This source file coalesces the V8 derived sources into a single object file to
-#else
-// This source file coalesces the HTML elements into a single object file to
-#endif
 // reduce bloat and allow us to link release builds on 32-bit Windows.
 
 #include "bindings/V8Attr.cpp"
@@ -87,9 +83,6 @@
 #include "bindings/V8Document.cpp"
 #include "bindings/V8DocumentFragment.cpp"
 #include "bindings/V8DocumentType.cpp"
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-#include "bindings/V8DOMApplicationCache.cpp"
-#endif
 #include "bindings/V8DOMCoreException.cpp"
 #include "bindings/V8DOMImplementation.cpp"
 #include "bindings/V8DOMParser.cpp"
@@ -194,13 +187,6 @@
 #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"
@@ -212,9 +198,42 @@
 #include "bindings/V8Rect.cpp"
 #include "bindings/V8RGBColor.cpp"
 #include "bindings/V8Screen.cpp"
+#include "bindings/V8StyleSheet.cpp"
+#include "bindings/V8StyleSheetList.cpp"
+#include "bindings/V8Text.cpp"
+#include "bindings/V8TextEvent.cpp"
+#include "bindings/V8TextMetrics.cpp"
+#include "bindings/V8TimeRanges.cpp"
+#include "bindings/V8TreeWalker.cpp"
+#include "bindings/V8UIEvent.cpp"
+#include "bindings/V8ValidityState.cpp"
+#include "bindings/V8WebKitAnimationEvent.cpp"
+#include "bindings/V8WebKitCSSKeyframeRule.cpp"
+#include "bindings/V8WebKitCSSKeyframesRule.cpp"
+#include "bindings/V8WebKitCSSMatrix.cpp"
+#include "bindings/V8WebKitCSSTransformValue.cpp"
+#include "bindings/V8WebKitPoint.cpp"
+#include "bindings/V8WebKitTransitionEvent.cpp"
+#include "bindings/V8WheelEvent.cpp"
+#include "bindings/V8XMLHttpRequest.cpp"
+#include "bindings/V8XMLHttpRequestException.cpp"
+#include "bindings/V8XMLHttpRequestProgressEvent.cpp"
+#include "bindings/V8XMLHttpRequestUpload.cpp"
+#include "bindings/V8XMLSerializer.cpp"
+
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+#include "bindings/V8DOMApplicationCache.cpp"
+#endif
+
+#if ENABLE(DOM_STORAGE)
+#include "bindings/V8Storage.cpp"
+#include "bindings/V8StorageEvent.cpp"
+#endif
+
+#if ENABLE(WEB_SOCKETS)
+#include "bindings/V8WebSocket.cpp"
+#endif
 
-#if PLATFORM(ANDROID)
-// TODO: Upstream DATABASE guard.
 #if ENABLE(DATABASE)
 #include "bindings/V8Database.cpp"
 #include "bindings/V8SQLError.cpp"
@@ -222,17 +241,20 @@
 #include "bindings/V8SQLResultSetRowList.cpp"
 #include "bindings/V8SQLTransaction.cpp"
 #endif
+
+#if ENABLE(WORKERS)
+#include "bindings/V8AbstractWorker.cpp"
+#include "bindings/V8DedicatedWorkerContext.cpp"
+#include "bindings/V8Worker.cpp"
+#include "bindings/V8WorkerContext.cpp"
+#include "bindings/V8WorkerLocation.cpp"
+#include "bindings/V8WorkerNavigator.cpp"
 #endif
 
-#if ENABLE(DOM_STORAGE)
-#include "bindings/V8Storage.cpp"
-#include "bindings/V8StorageEvent.cpp"
+#if ENABLE(SHARED_WORKERS)
+#include "bindings/V8SharedWorker.cpp"
 #endif
-#include "bindings/V8StyleSheet.cpp"
-#include "bindings/V8StyleSheetList.cpp"
 
-#if PLATFORM(ANDROID)
-// TODO: Upstream SVG guard.
 #if ENABLE(SVG)
 #include "bindings/V8SVGAElement.cpp"
 #include "bindings/V8SVGAltGlyphElement.cpp"
@@ -344,48 +366,7 @@
 #include "bindings/V8SVGViewElement.cpp"
 #include "bindings/V8SVGZoomEvent.cpp"
 #endif
-#endif
-
-#include "bindings/V8Text.cpp"
-#include "bindings/V8TextEvent.cpp"
-#include "bindings/V8TextMetrics.cpp"
-#include "bindings/V8TimeRanges.cpp"
-#include "bindings/V8TreeWalker.cpp"
-#include "bindings/V8UIEvent.cpp"
-#include "bindings/V8ValidityState.cpp"
-#include "bindings/V8WebKitAnimationEvent.cpp"
-#include "bindings/V8WebKitCSSKeyframeRule.cpp"
-#include "bindings/V8WebKitCSSKeyframesRule.cpp"
-#include "bindings/V8WebKitCSSMatrix.cpp"
-#include "bindings/V8WebKitCSSTransformValue.cpp"
-#include "bindings/V8WebKitPoint.cpp"
-#include "bindings/V8WebKitTransitionEvent.cpp"
-#if ENABLE(WEB_SOCKETS)
-#include "bindings/V8WebSocket.cpp"
-#endif
-#include "bindings/V8WheelEvent.cpp"
-
-#if PLATFORM(ANDROID)
-// TODO: Upstream WORKERS guard.
-#if ENABLE(WORKERS)
-#include "bindings/V8AbstractWorker.cpp"
-#include "bindings/V8DedicatedWorkerContext.cpp"
-#include "bindings/V8SharedWorker.cpp"
-#include "bindings/V8Worker.cpp"
-#include "bindings/V8WorkerContext.cpp"
-#include "bindings/V8WorkerLocation.cpp"
-#include "bindings/V8WorkerNavigator.cpp"
-#endif
-#endif
-
-#include "bindings/V8XMLHttpRequest.cpp"
-#include "bindings/V8XMLHttpRequestException.cpp"
-#include "bindings/V8XMLHttpRequestProgressEvent.cpp"
-#include "bindings/V8XMLHttpRequestUpload.cpp"
-#include "bindings/V8XMLSerializer.cpp"
 
-#if PLATFORM(ANDROID)
-// TODO: Upstream XPATH guard.
 #if ENABLE(XPATH)
 #include "bindings/V8XPathEvaluator.cpp"
 #include "bindings/V8XPathException.cpp"
@@ -393,18 +374,19 @@
 #include "bindings/V8XPathNSResolver.cpp"
 #include "bindings/V8XPathResult.cpp"
 #endif
-#endif
 
-#if PLATFORM(ANDROID)
-// TODO: Upstream XSLT guard.
 #if ENABLE(XSLT)
 #include "bindings/V8XSLTProcessor.cpp"
 #endif
-#endif
 
-#if PLATFORM(ANDROID)
-// TODO: Upstream INSPECTOR guard.
 #if ENABLE(INSPECTOR)
 #include "bindings/V8InspectorBackend.cpp"
 #endif
+
+#if PLATFORM(ANDROID)
+// TODO: Upstream NOTIFICATIONS guard.
+#if ENABLE(NOTIFICATIONS)
+#include "bindings/V8Notification.cpp"
+#include "bindings/V8NotificationCenter.cpp"
+#endif
 #endif
diff --git a/WebCore/bindings/v8/V8Index.cpp b/WebCore/bindings/v8/V8Index.cpp
index 396c93f..2cbd16d 100644
--- a/WebCore/bindings/v8/V8Index.cpp
+++ b/WebCore/bindings/v8/V8Index.cpp
@@ -410,8 +410,6 @@
 #include "V8CanvasUnsignedShortArray.h"
 #endif
 
-#if PLATFORM(ANDROID)
-// TODO: Upstream these guards to webkit.org
 #if ENABLE(DATABASE)
 #include "V8Database.h"
 #include "V8SQLError.h"
@@ -420,25 +418,12 @@
 #include "V8SQLTransaction.h"
 #endif
 
-#if ENABLE(GEOLOCATION)
-#include "V8Coordinates.h"
-#include "V8Geolocation.h"
-#include "V8Geoposition.h"
-#include "V8PositionError.h"
-#endif
-
-#if ENABLE(TOUCH_EVENTS)
-#include "V8Touch.h"
-#include "V8TouchList.h"
-#include "V8TouchEvent.h"
-#endif
-
 #if ENABLE(XPATH)
 #include "V8XPathResult.h"
 #include "V8XPathException.h"
 #include "V8XPathExpression.h"
-#include "V8XPathEvaluator.h"
 #include "V8XPathNSResolver.h"
+#include "V8XPathEvaluator.h"
 #endif
 
 #if ENABLE(XSLT)
@@ -449,6 +434,21 @@
 #include "V8InspectorBackend.h"
 #endif
 
+#if PLATFORM(ANDROID)
+// TODO: Upstream these guards to webkit.org
+#if ENABLE(GEOLOCATION)
+#include "V8Coordinates.h"
+#include "V8Geolocation.h"
+#include "V8Geoposition.h"
+#include "V8PositionError.h"
+#endif
+
+#if ENABLE(TOUCH_EVENTS)
+#include "V8Touch.h"
+#include "V8TouchList.h"
+#include "V8TouchEvent.h"
+#endif
+
 #include "V8VoidCallback.h"
 #endif  // PLATFORM(ANDROID)
 
diff --git a/WebCore/bindings/v8/V8Index.h b/WebCore/bindings/v8/V8Index.h
index 6255079..179b963 100644
--- a/WebCore/bindings/v8/V8Index.h
+++ b/WebCore/bindings/v8/V8Index.h
@@ -83,7 +83,7 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
 #endif
 
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
-#define APPLICATIONCACHE_NONNODE_WRAPPER_TYPES(V)                      \
+#define APPLICATIONCACHE_NONNODE_WRAPPER_TYPES(V)                       \
   V(DOMAPPLICATIONCACHE, DOMApplicationCache)
 #else
 #define APPLICATIONCACHE_NONNODE_WRAPPER_TYPES(V)
@@ -100,7 +100,9 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
 #if ENABLE(SHARED_WORKERS)
 #define SHARED_WORKER_ACTIVE_OBJECT_WRAPPER_TYPES(V)                    \
     V(SHAREDWORKER, SharedWorker)
-#define SHARED_WORKER_NONNODE_WRAPPER_TYPES(V)
+
+#define SHARED_WORKER_NONNODE_WRAPPER_TYPES(V)                          \
+    V(SHAREDWORKERCONTEXT, SharedWorkerContext)
 #else
 #define SHARED_WORKER_ACTIVE_OBJECT_WRAPPER_TYPES(V)
 #define SHARED_WORKER_NONNODE_WRAPPER_TYPES(V)
@@ -363,7 +365,7 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
     V(CANVASPIXELARRAY, CanvasPixelArray)                               \
     V(KEYBOARDEVENT, KeyboardEvent)                                     \
     V(LOCATION, Location)                                               \
-    V(MEDIA, Media)                                               \
+    V(MEDIA, Media)                                                     \
     V(MEDIALIST, MediaList)
 
 #define DOM_OBJECT_TYPES_2(V)                                           \
@@ -463,17 +465,6 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
 #define DOM_OBJECT_3D_CANVAS_TYPES(V)
 #endif
 
-#if PLATFORM(ANDROID)
-// TODO: Upstream these guards.
-#if ENABLE(TOUCH_EVENTS)
-#define DOM_OBJECT_TOUCH_EVENT_TYPES(V)                                 \
-    V(TOUCHLIST, TouchList)                                             \
-    V(TOUCHEVENT, TouchEvent)                                           \
-    V(TOUCH, Touch)
-#else
-#define DOM_OBJECT_TOUCH_EVENT_TYPES(V)
-#endif
-
 #if ENABLE(XPATH)
 #define DOM_OBJECT_XPATH_TYPES(V)                                       \
     V(XPATHEVALUATOR, XPathEvaluator)                                   \
@@ -492,6 +483,13 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
 #define DOM_OBJECT_XSLT_TYPES(V)
 #endif
 
+#if ENABLE(INSPECTOR)
+#define DOM_OBJECT_INSPECTOR_TYPES(V)                                   \
+    V(INSPECTORBACKEND, InspectorBackend)
+#else
+#define DOM_OBJECT_INSPECTOR_TYPES(V)
+#endif
+
 #if ENABLE(GEOLOCATION)
 #define DOM_OBJECT_GEOLOCATION_TYPES(V)                                 \
     V(COORDINATES, Coordinates)                                         \
@@ -502,11 +500,15 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
 #define DOM_OBJECT_GEOLOCATION_TYPES(V)
 #endif
 
-#if ENABLE(INSPECTOR)
-#define DOM_OBJECT_INSPECTOR_TYPES(V)                                   \
-    V(INSPECTORBACKEND, InspectorBackend)
+#if PLATFORM(ANDROID)
+// TODO: Upstream this guard.
+#if ENABLE(TOUCH_EVENTS)
+#define DOM_OBJECT_TOUCH_EVENT_TYPES(V)                                 \
+    V(TOUCHLIST, TouchList)                                             \
+    V(TOUCHEVENT, TouchEvent)                                           \
+    V(TOUCH, Touch)
 #else
-#define DOM_OBJECT_INSPECTOR_TYPES(V)
+#define DOM_OBJECT_TOUCH_EVENT_TYPES(V)
 #endif
 #endif