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

2 files changed, 1 insertions, 25 deletions

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.