Merge change 20934 into master-webkit-merge

* changes:
  Merge half of V8Binding/binding

7 files changed, 50 insertions, 0 deletions

diff --git a/WebCore/bindings/v8/DOMObjectsInclude.h b/WebCore/bindings/v8/DOMObjectsInclude.h
index 63464db..9d21885 100644
--- a/WebCore/bindings/v8/DOMObjectsInclude.h
+++ b/WebCore/bindings/v8/DOMObjectsInclude.h
@@ -140,6 +140,7 @@
 #include "V8NodeFilterCondition.h"
 #include "V8ObjectEventListener.h"
 #include "ValidityState.h"
+#include "VoidCallback.h"
 #include "WebKitAnimationEvent.h"
 #include "WebKitCSSKeyframeRule.h"
 #include "WebKitCSSKeyframesRule.h"
@@ -172,6 +173,14 @@
 #include "StorageEvent.h"
 #endif // DOM_STORAGE
 
+#if ENABLE(GEOLOCATION)
+#include "Coordinates.h"
+#include "Geolocation.h"
+#include "Geoposition.h"
+#include "PositionError.h"
+#include "PositionErrorCallback.h"
+#endif
+
 #if ENABLE(SVG)
 #include "SVGAngle.h"
 #include "SVGAnimatedPoints.h"
@@ -206,6 +215,12 @@
 #include "V8SVGPODTypeWrapper.h"
 #endif // SVG
 
+#if ENABLE(TOUCH_EVENTS)
+#include "Touch.h"
+#include "TouchList.h"
+#include "TouchEvent.h"
+#endif
+
 #if ENABLE(WORKERS)
 #include "DedicatedWorkerContext.h"
 #include "Worker.h"
diff --git a/WebCore/bindings/v8/NPV8Object.cpp b/WebCore/bindings/v8/NPV8Object.cpp
index 15dc852..0fd9f89 100644
--- a/WebCore/bindings/v8/NPV8Object.cpp
+++ b/WebCore/bindings/v8/NPV8Object.cpp
@@ -28,7 +28,10 @@
 
 #include "NPV8Object.h"
 
+if PLATFORM(CHROMIUM)
+// TODO(andreip): upstream
 #include "ChromiumBridge.h"
+#endif
 #include "DOMWindow.h"
 #include "Frame.h"
 #include "OwnArrayPtr.h"
@@ -235,7 +238,13 @@ bool _NPN_InvokeDefault(NPP npp, NPObject* npObject, const NPVariant* arguments,
 
 bool _NPN_Evaluate(NPP npp, NPObject* npObject, NPString* npScript, NPVariant* result)
 {
+#if PLATFORM(CHROMIUM)
     bool popupsAllowed = WebCore::ChromiumBridge::popupsAllowed(npp);
+#else
+    // TODO(andreip): Some of the binding code is specific to Chromium
+    // and we don't want it to Android. What is the preferred way to handle this?
+    bool popupsAllowed = false;
+#endif
     return _NPN_EvaluateHelper(npp, popupsAllowed, npObject, npScript, result);
 }
 
diff --git a/WebCore/bindings/v8/NPV8Object.h b/WebCore/bindings/v8/NPV8Object.h
index 65a7ccf..1b65a1f 100644
--- a/WebCore/bindings/v8/NPV8Object.h
+++ b/WebCore/bindings/v8/NPV8Object.h
@@ -30,7 +30,12 @@
 #ifndef NPV8Object_h
 #define NPV8Object_h
 
+#if PLATFORM(CHROMIUM)
+// TODO(andreip): diff and consolidate
 #include "bindings/npruntime.h"
+#else
+#include "bridge/npruntime.h"  // use WebCore version
+#endif
 #include <v8.h>
 
 namespace WebCore {
diff --git a/WebCore/bindings/v8/V8NPObject.h b/WebCore/bindings/v8/V8NPObject.h
index 0a759b5..58ad579 100644
--- a/WebCore/bindings/v8/V8NPObject.h
+++ b/WebCore/bindings/v8/V8NPObject.h
@@ -32,7 +32,12 @@
 #define V8NPObject_h
 
 #include <v8.h>
+#if PLATFORM(CHROMIUM)
+// TODO(andreip): diff and consolidate.
 #include "third_party/npapi/bindings/npruntime.h"
+#else
+#include "bridge/npruntime.h"  // use WebCore version
+#endif
 
 // These functions can be replaced by normal JS operation.
 // Getters
diff --git a/WebCore/bindings/v8/V8NPUtils.h b/WebCore/bindings/v8/V8NPUtils.h
index 82a74b3..ffd612f 100644
--- a/WebCore/bindings/v8/V8NPUtils.h
+++ b/WebCore/bindings/v8/V8NPUtils.h
@@ -31,7 +31,12 @@
 #define V8NPUtils_h
 
 #include <v8.h>
+#if PLATFORM(CHROMIUM)
+// TODO(andreip): diff and consolidate.
 #include "third_party/npapi/bindings/npruntime.h"
+#else
+#include "bridge/npruntime.h"  // use WebCore version
+#endif
 
 // Convert a V8 Value of any type (string, bool, object, etc) to a NPVariant.
 void convertV8ObjectToNPVariant(v8::Local<v8::Value>, NPObject*, NPVariant*);
diff --git a/WebCore/bindings/v8/npruntime_impl.h b/WebCore/bindings/v8/npruntime_impl.h
index 31c0f42..4c43fb4 100644
--- a/WebCore/bindings/v8/npruntime_impl.h
+++ b/WebCore/bindings/v8/npruntime_impl.h
@@ -31,7 +31,12 @@
 #ifndef npruntime_impl_h
 #define npruntime_impl_h
 
+#if PLATFORM(CHROMIUM)
+// TODO(andreip): diff and consolidate
 #include "bindings/npruntime.h"
+#else
+#include "bridge/npruntime.h"  // use WebCore version
+#endif
 
 // This file exists to support WebCore, which expects to be able to call upon
 // portions of the NPRuntime implementation.
diff --git a/WebCore/bindings/v8/npruntime_priv.h b/WebCore/bindings/v8/npruntime_priv.h
index 3887758..1fb326a 100644
--- a/WebCore/bindings/v8/npruntime_priv.h
+++ b/WebCore/bindings/v8/npruntime_priv.h
@@ -26,7 +26,13 @@
 #ifndef npruntime_priv_h
 #define npruntime_priv_h
 
+#if PLATFORM(CHROMIUM)
+// TODO(andreip): look at the diff between the two npruntime.h files
+// and try to consolidate them.
 #include "third_party/npapi/bindings/npruntime.h"
+#else
+#include "bridge/npruntime.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {