Merge webkit.org at r55033 : Fix merge conflicts

- Android.v8bindings.mk - Keep ours, conflict due to upstreaming of using DerivedSourcesAllInOne.cpp
- V8Index.h - Keep ours, conflict due to upstreaming of touch events
- GeolocationService.h - Take both, conflict due to Android-specific change for pausing service
- PluginView.cpp - Take both, conflict due to Android-specific change to guard JSC headers
- V8DOMWrapper.cpp - Keep ours, conflict due to addition of WORKERS guards

Change-Id: Ib640e64caecbb8cb31272dbfbc18d95f32f9d126

5 files changed, 11 insertions, 64 deletions

diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk
index c4fc52e..603ca74 100644
--- a/WebCore/Android.v8bindings.mk
+++ b/WebCore/Android.v8bindings.mk
@@ -49,13 +49,9 @@ LOCAL_SRC_FILES += \
 	bindings/v8/DateExtension.cpp \
 	bindings/v8/DOMData.cpp \
 	bindings/v8/DOMDataStore.cpp \
-<<<<<<< HEAD
 	bindings/v8/DOMWrapperWorld.cpp \
 	bindings/v8/DerivedSourcesAllInOne.cpp \
 	bindings/v8/IsolatedWorld.cpp \
-=======
-	bindings/v8/DerivedSourcesAllInOne.cpp \
->>>>>>> webkit.org at r55033
 	bindings/v8/MainThreadDOMData.cpp \
 	bindings/v8/NPV8Object.cpp \
 	bindings/v8/ScheduledAction.cpp \
diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp
index a0cae1d..cf11e6c 100644
--- a/WebCore/bindings/v8/V8DOMWrapper.cpp
+++ b/WebCore/bindings/v8/V8DOMWrapper.cpp
@@ -272,20 +272,14 @@ PassRefPtr<NodeFilter> V8DOMWrapper::wrapNativeNodeFilter(v8::Handle<v8::Value>
 
 static bool globalObjectPrototypeIsDOMWindow(v8::Handle<v8::Object> objectPrototype)
 {
-<<<<<<< HEAD
 #if ENABLE(SHARED_WORKERS)
-=======
->>>>>>> webkit.org at r55033
     // We can identify what type of context the global object is wrapping by looking at the
     // internal field count of its prototype. This assumes WorkerContexts and DOMWindows have different numbers
     // of internal fields, so a COMPILE_ASSERT is included to warn if this ever changes. DOMWindow has
     // traditionally had far more internal fields than any other class.
     COMPILE_ASSERT(V8DOMWindow::internalFieldCount != V8WorkerContext::internalFieldCount && V8DOMWindow::internalFieldCount != V8SharedWorkerContext::internalFieldCount,
         DOMWindowAndWorkerContextHaveUnequalFieldCounts);
-<<<<<<< HEAD
 #endif
-=======
->>>>>>> webkit.org at r55033
     return objectPrototype->InternalFieldCount() == V8DOMWindow::internalFieldCount;
 }
 
@@ -304,15 +298,10 @@ v8::Local<v8::Object> V8DOMWrapper::instantiateV8Object(V8Proxy* proxy, V8ClassI
             v8::Handle<v8::Object> globalPrototype = v8::Handle<v8::Object>::Cast(context->Global()->GetPrototype());
             if (globalObjectPrototypeIsDOMWindow(globalPrototype))
                 proxy = V8Proxy::retrieve(V8DOMWindow::toNative(globalPrototype)->frame());
-<<<<<<< HEAD
 #if ENABLE(WORKERS)
             else
-                workerContext = V8WorkerContext::toNative(globalPrototype);
-#endif
-=======
-            else
                 workerContext = V8WorkerContext::toNative(lookupDOMWrapper(V8WorkerContext::GetTemplate(), context->Global()));
->>>>>>> webkit.org at r55033
+#endif
         }
     }
 
@@ -322,17 +311,11 @@ v8::Local<v8::Object> V8DOMWrapper::instantiateV8Object(V8Proxy* proxy, V8ClassI
         instance = proxy->windowShell()->createWrapperFromCache(type);
     else {
         v8::Local<v8::Function> function;
-<<<<<<< HEAD
 #if ENABLE(WORKERS)
         if (workerContext)
             function = getConstructor(type, workerContext);
         else
 #endif
-=======
-        if (workerContext)
-            function = getConstructor(type, workerContext);
-        else
->>>>>>> webkit.org at r55033
             function = V8ClassIndex::getTemplate(type)->GetFunction();
         instance = SafeAllocation::newInstance(function);
     }
diff --git a/WebCore/bindings/v8/V8Index.h b/WebCore/bindings/v8/V8Index.h
index 5bb38c5..d863d95 100644
--- a/WebCore/bindings/v8/V8Index.h
+++ b/WebCore/bindings/v8/V8Index.h
@@ -535,7 +535,6 @@ static const int v8DefaultWrapperInternalFieldCount = 2;
 #define DOM_OBJECT_TOUCH_EVENT_TYPES(V)
 #endif
 
-<<<<<<< HEAD
 #if PLATFORM(ANDROID)
 // We don't plan to upstream CONNECTION as it's only temporary, so we
 // don't need a default here.
@@ -545,8 +544,6 @@ static const int v8DefaultWrapperInternalFieldCount = 2;
 
 #if PLATFORM(ANDROID)
 // This block is modified, but is not Android-specific.
-=======
->>>>>>> webkit.org at r55033
 #define DOM_OBJECT_TYPES(V)                                             \
     DOM_OBJECT_TYPES_1(V)                                               \
     DOM_OBJECT_TYPES_2(V)                                               \
@@ -559,13 +556,9 @@ static const int v8DefaultWrapperInternalFieldCount = 2;
     DOM_OBJECT_XSLT_TYPES(V)                                            \
     DOM_OBJECT_INSPECTOR_TYPES(V)                                       \
     DOM_OBJECT_GEOLOCATION_TYPES(V)                                     \
-<<<<<<< HEAD
     DOM_OBJECT_TOUCH_EVENT_TYPES(V)                                     \
     DOM_OBJECT_CONNECTION_TYPES(V)
 #endif
-=======
-    DOM_OBJECT_TOUCH_EVENT_TYPES(V)
->>>>>>> webkit.org at r55033
 
 #if ENABLE(SVG)
 // SVG_OBJECT_TYPES are svg non-node, non-pod types.
diff --git a/WebCore/platform/GeolocationService.h b/WebCore/platform/GeolocationService.h
index 3fcec47..363865d 100644
--- a/WebCore/platform/GeolocationService.h
+++ b/WebCore/platform/GeolocationService.h
@@ -46,15 +46,11 @@ class GeolocationService : public Noncopyable {
 public:
     static GeolocationService* create(GeolocationServiceClient*);
     virtual ~GeolocationService() { }
-<<<<<<< HEAD
-    
+
 #if PLATFORM(ANDROID)
     // TODO: Upstream to webkit.org. See https://bugs.webkit.org/show_bug.cgi?id=34082
     virtual bool startUpdating(PositionOptions*, bool suspend) { return false; }
 #else
-=======
-
->>>>>>> webkit.org at r55033
     virtual bool startUpdating(PositionOptions*) { return false; }
 #endif
     virtual void stopUpdating() { }
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index 2317849..ba8d231 100644
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -41,39 +41,30 @@
 #include "GraphicsContext.h"
 #include "HTMLNames.h"
 #include "HTMLPlugInElement.h"
-<<<<<<< HEAD
-=======
 #include "Image.h"
-#include "JSDOMBinding.h"
-#include "JSDOMWindow.h"
->>>>>>> webkit.org at r55033
 #include "KeyboardEvent.h"
 #include "MIMETypeRegistry.h"
 #include "MouseEvent.h"
 #include "NotImplemented.h"
 #include "Page.h"
 #include "PlatformMouseEvent.h"
-<<<<<<< HEAD
-#if OS(WINDOWS) && ENABLE(NETSCAPE_PLUGIN_API)
-#include "PluginMessageThrottlerWin.h"
-#endif
-#include "PluginPackage.h"
-#include "ScriptController.h"
-#include "ScriptValue.h"
-#include "SecurityOrigin.h"
-=======
->>>>>>> webkit.org at r55033
 #include "PluginDatabase.h"
 #include "PluginDebug.h"
 #include "PluginMainThreadScheduler.h"
 #include "PluginPackage.h"
 #include "RenderBox.h"
 #include "RenderObject.h"
-<<<<<<< HEAD
-#include "npruntime_impl.h"
+#include "ScriptController.h"
+#include "ScriptValue.h"
+#include "SecurityOrigin.h"
 #include "Settings.h"
+#include "npruntime_impl.h"
 #include <wtf/ASCIICType.h>
 
+#if OS(WINDOWS) && ENABLE(NETSCAPE_PLUGIN_API)
+#include "PluginMessageThrottlerWin.h"
+#endif
+
 #if defined(ANDROID_PLUGINS)
 #include "TouchEvent.h"
 #endif
@@ -81,25 +72,13 @@
 // ANDROID
 // TODO: Upstream to webkit.org
 #if USE(JSC)
-#include "JSDOMWindow.h"
 #include "JSDOMBinding.h"
+#include "JSDOMWindow.h"
 #include "c_instance.h"
-=======
-#include "ScriptController.h"
-#include "ScriptValue.h"
-#include "SecurityOrigin.h"
-#include "Settings.h"
-#include "c_instance.h"
-#include "npruntime_impl.h"
->>>>>>> webkit.org at r55033
 #include "runtime_root.h"
 #include <runtime/JSLock.h>
 #include <runtime/JSValue.h>
 
-#if OS(WINDOWS) && ENABLE(NETSCAPE_PLUGIN_API)
-#include "PluginMessageThrottlerWin.h"
-#endif
-
 using JSC::ExecState;
 using JSC::JSLock;
 using JSC::JSObject;