Merge webkit.org at R49305 : Fix merge conflicts.

Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a

15 files changed, 23 insertions, 265 deletions

diff --git a/WebCore/bindings/js/JSCustomPositionCallback.cpp b/WebCore/bindings/js/JSCustomPositionCallback.cpp
index 07788a8..e5f83aa 100644
--- a/WebCore/bindings/js/JSCustomPositionCallback.cpp
+++ b/WebCore/bindings/js/JSCustomPositionCallback.cpp
@@ -48,20 +48,7 @@ void JSCustomPositionCallback::handleEvent(Geoposition* geoposition)
     ExecState* exec = m_data.globalObject()->globalExec();
     MarkedArgumentBuffer args;
     args.append(toJS(exec, deprecatedGlobalObjectForPrototype(exec), geoposition));
-<<<<<<< HEAD:WebCore/bindings/js/JSCustomPositionCallback.cpp
-
-    globalObject->globalData()->timeoutChecker.start();
-    call(exec, function, callType, callData, m_callback, args);
-    globalObject->globalData()->timeoutChecker.stop();
-    
-    if (exec->hadException()) {
-        reportCurrentException(exec);
-    }
-    
-    Document::updateStyleForAllDocuments();
-=======
     m_data.invokeCallback(args);
->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSCustomPositionCallback.cpp
 }
 
 } // namespace WebCore
diff --git a/WebCore/bindings/js/JSCustomPositionCallback.h b/WebCore/bindings/js/JSCustomPositionCallback.h
index dff34fe..ad5528d 100644
--- a/WebCore/bindings/js/JSCustomPositionCallback.h
+++ b/WebCore/bindings/js/JSCustomPositionCallback.h
@@ -42,11 +42,6 @@ public:
         return adoptRef(new JSCustomPositionCallback(callback, globalObject));
     }
     
-<<<<<<< HEAD:WebCore/bindings/js/JSCustomPositionCallback.h
-    virtual void handleEvent(Geoposition*);
-
-=======
->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSCustomPositionCallback.h
 private:
     JSCustomPositionCallback(JSC::JSObject* callback, JSDOMGlobalObject*);
 
diff --git a/WebCore/bindings/js/JSGeolocationCustom.cpp b/WebCore/bindings/js/JSGeolocationCustom.cpp
index 23a4c00..530b89b 100644
--- a/WebCore/bindings/js/JSGeolocationCustom.cpp
+++ b/WebCore/bindings/js/JSGeolocationCustom.cpp
@@ -41,58 +41,32 @@ using namespace std;
 
 namespace WebCore {
 
-<<<<<<< HEAD:WebCore/bindings/js/JSGeolocationCustom.cpp
-static PassRefPtr<PositionCallback> createPositionCallback(ExecState* exec, JSValue value)
-=======
 static PassRefPtr<PositionCallback> createPositionCallback(ExecState* exec, JSDOMGlobalObject* globalObject, JSValue value)
->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSGeolocationCustom.cpp
 {
     // The spec specifies 'FunctionOnly' for this object.
-<<<<<<< HEAD:WebCore/bindings/js/JSGeolocationCustom.cpp
-    if (!value.isObject(&InternalFunction::info)) {
-=======
     if (!value.inherits(&InternalFunction::info)) {
->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSGeolocationCustom.cpp
         setDOMException(exec, TYPE_MISMATCH_ERR);
         return 0;
     }
 
     JSObject* object = asObject(value);
-<<<<<<< HEAD:WebCore/bindings/js/JSGeolocationCustom.cpp
-    Frame* frame = toJSDOMWindow(exec->lexicalGlobalObject())->impl()->frame();
-    return JSCustomPositionCallback::create(object, frame);
-=======
     return JSCustomPositionCallback::create(object, globalObject);
->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSGeolocationCustom.cpp
 }
 
-<<<<<<< HEAD:WebCore/bindings/js/JSGeolocationCustom.cpp
-static PassRefPtr<PositionErrorCallback> createPositionErrorCallback(ExecState* exec, JSValue value)
-=======
 static PassRefPtr<PositionErrorCallback> createPositionErrorCallback(ExecState* exec, JSDOMGlobalObject* globalObject, JSValue value)
->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSGeolocationCustom.cpp
 {
     // Argument is optional (hence undefined is allowed), and null is allowed.
     if (value.isUndefinedOrNull())
         return 0;
 
     // The spec specifies 'FunctionOnly' for this object.
-<<<<<<< HEAD:WebCore/bindings/js/JSGeolocationCustom.cpp
-    if (!value.isObject(&InternalFunction::info)) {
-=======
     if (!value.inherits(&InternalFunction::info)) {
->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSGeolocationCustom.cpp
         setDOMException(exec, TYPE_MISMATCH_ERR);
         return 0;
     }
 
     JSObject* object = asObject(value);
-<<<<<<< HEAD:WebCore/bindings/js/JSGeolocationCustom.cpp
-    Frame* frame = toJSDOMWindow(exec->lexicalGlobalObject())->impl()->frame();
-    return JSCustomPositionErrorCallback::create(object, frame);
-=======
     return JSCustomPositionErrorCallback::create(object, globalObject);
->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSGeolocationCustom.cpp
 }
 
 static PassRefPtr<PositionOptions> createPositionOptions(ExecState* exec, JSValue value)
@@ -163,20 +137,12 @@ JSValue JSGeolocation::getCurrentPosition(ExecState* exec, const ArgList& args)
 {
     // Arguments: PositionCallback, (optional)PositionErrorCallback, (optional)PositionOptions
 
-<<<<<<< HEAD:WebCore/bindings/js/JSGeolocationCustom.cpp
-    RefPtr<PositionCallback> positionCallback = createPositionCallback(exec, args.at(0));
-=======
     RefPtr<PositionCallback> positionCallback = createPositionCallback(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), args.at(0));
->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSGeolocationCustom.cpp
     if (exec->hadException())
         return jsUndefined();
     ASSERT(positionCallback);
 
-<<<<<<< HEAD:WebCore/bindings/js/JSGeolocationCustom.cpp
-    RefPtr<PositionErrorCallback> positionErrorCallback = createPositionErrorCallback(exec, args.at(1));
-=======
     RefPtr<PositionErrorCallback> positionErrorCallback = createPositionErrorCallback(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), args.at(1));
->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSGeolocationCustom.cpp
     if (exec->hadException())
         return jsUndefined();
 
@@ -193,20 +159,12 @@ JSValue JSGeolocation::watchPosition(ExecState* exec, const ArgList& args)
 {
     // Arguments: PositionCallback, (optional)PositionErrorCallback, (optional)PositionOptions
 
-<<<<<<< HEAD:WebCore/bindings/js/JSGeolocationCustom.cpp
-    RefPtr<PositionCallback> positionCallback = createPositionCallback(exec, args.at(0));
-=======
     RefPtr<PositionCallback> positionCallback = createPositionCallback(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), args.at(0));
->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSGeolocationCustom.cpp
     if (exec->hadException())
         return jsUndefined();
     ASSERT(positionCallback);
 
-<<<<<<< HEAD:WebCore/bindings/js/JSGeolocationCustom.cpp
-    RefPtr<PositionErrorCallback> positionErrorCallback = createPositionErrorCallback(exec, args.at(1));
-=======
     RefPtr<PositionErrorCallback> positionErrorCallback = createPositionErrorCallback(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), args.at(1));
->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSGeolocationCustom.cpp
     if (exec->hadException())
         return jsUndefined();
 
diff --git a/WebCore/bindings/js/ScriptObject.cpp b/WebCore/bindings/js/ScriptObject.cpp
index aaf4163..b69ef2b 100644
--- a/WebCore/bindings/js/ScriptObject.cpp
+++ b/WebCore/bindings/js/ScriptObject.cpp
@@ -135,11 +135,8 @@ bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, const S
     return handleException(scriptState);
 }
 
-<<<<<<< HEAD:WebCore/bindings/js/ScriptObject.cpp
 #if ENABLE(JAVASCRIPT_DEBUGGER)
-=======
 #if ENABLE(INSPECTOR)
->>>>>>> webkit.org at 49305:WebCore/bindings/js/ScriptObject.cpp
 bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, InspectorBackend* value)
 {
     JSLock lock(SilenceAssertionsOnly);
@@ -147,11 +144,8 @@ bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, Inspect
     globalObject->putDirect(Identifier(scriptState, name), toJS(scriptState, globalObject, value));
     return handleException(scriptState);
 }
-<<<<<<< HEAD:WebCore/bindings/js/ScriptObject.cpp
-#endif
-=======
 #endif // ENABLE(INSPECTOR)
->>>>>>> webkit.org at 49305:WebCore/bindings/js/ScriptObject.cpp
+#endif
 
 bool ScriptGlobalObject::get(ScriptState* scriptState, const char* name, ScriptObject& value)
 {
diff --git a/WebCore/bindings/v8/DOMObjectsInclude.h b/WebCore/bindings/v8/DOMObjectsInclude.h
index 682ce79..275d56d 100644
--- a/WebCore/bindings/v8/DOMObjectsInclude.h
+++ b/WebCore/bindings/v8/DOMObjectsInclude.h
@@ -234,15 +234,14 @@
 #include "V8SVGPODTypeWrapper.h"
 #endif // SVG
 
-<<<<<<< HEAD:WebCore/bindings/v8/DOMObjectsInclude.h
 #if ENABLE(TOUCH_EVENTS)
 #include "Touch.h"
 #include "TouchList.h"
 #include "TouchEvent.h"
-=======
+#endif
+
 #if ENABLE(WEB_SOCKETS)
 #include "WebSocket.h"
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/DOMObjectsInclude.h
 #endif
 
 #if ENABLE(WORKERS)
diff --git a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
index 1dec0b1..b7c6132 100644
--- a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
+++ b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
@@ -207,20 +207,6 @@
 #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"
@@ -357,8 +343,8 @@
 #include "bindings/V8SVGUseElement.cpp"
 #include "bindings/V8SVGViewElement.cpp"
 #include "bindings/V8SVGZoomEvent.cpp"
-<<<<<<< HEAD:WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
-=======
+#endif
+
 #include "bindings/V8Text.cpp"
 #include "bindings/V8TextEvent.cpp"
 #include "bindings/V8TextMetrics.cpp"
@@ -373,19 +359,15 @@
 #include "bindings/V8WebKitCSSTransformValue.cpp"
 #include "bindings/V8WebKitPoint.cpp"
 #include "bindings/V8WebKitTransitionEvent.cpp"
+
 #if ENABLE(WEB_SOCKETS)
 #include "bindings/V8WebSocket.cpp"
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
 #endif
-<<<<<<< HEAD:WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
 
 #if ENABLE(WORKERS)
 #include "bindings/V8AbstractWorker.cpp"
 #include "bindings/V8DedicatedWorkerContext.cpp"
 #include "bindings/V8SharedWorker.cpp"
-=======
-#include "bindings/V8WheelEvent.cpp"
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
 #include "bindings/V8Worker.cpp"
 #include "bindings/V8WorkerContext.cpp"
 #include "bindings/V8WorkerLocation.cpp"
diff --git a/WebCore/bindings/v8/V8Binding.cpp b/WebCore/bindings/v8/V8Binding.cpp
index 7d84243..9ac7eae 100644
--- a/WebCore/bindings/v8/V8Binding.cpp
+++ b/WebCore/bindings/v8/V8Binding.cpp
@@ -207,19 +207,7 @@ String v8NonStringValueToWebCoreString(v8::Handle<v8::Value> object)
         throwError(block.Exception());
         return StringImpl::empty();
     }
-<<<<<<< HEAD:WebCore/bindings/v8/V8Binding.cpp
-    return v8StringToWebCoreString(v8String, DoNotExternalize, PlainStringType);
-}
-
-AtomicString v8ValueToAtomicWebCoreString(v8::Handle<v8::Value> v8Value)
-{
-    if (v8Value->IsString())
-        return v8StringToAtomicWebCoreString(v8::Handle<v8::String>::Cast(v8Value));
-    String string = v8ValueToWebCoreString(v8Value);
-    return AtomicString(string);
-=======
     return v8StringToWebCoreString<String>(v8String, DoNotExternalize);
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Binding.cpp
 }
 
 AtomicString v8NonStringValueToAtomicWebCoreString(v8::Handle<v8::Value> object)
diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp
index df8e833..4b0e895 100644
--- a/WebCore/bindings/v8/V8DOMWrapper.cpp
+++ b/WebCore/bindings/v8/V8DOMWrapper.cpp
@@ -31,14 +31,10 @@
 #include "config.h"
 #include "V8DOMWrapper.h"
 
-<<<<<<< HEAD:WebCore/bindings/v8/V8DOMWrapper.cpp
+#include "CSSMutableStyleDeclaration.h"
 #if PLATFORM(CHROMIUM)
 #include "ChromiumBridge.h"
 #endif
-=======
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8DOMWrapper.cpp
-#include "CSSMutableStyleDeclaration.h"
-#include "ChromiumBridge.h"
 #include "DOMObjectsInclude.h"
 #include "DocumentLoader.h"
 #include "FrameLoaderClient.h"
diff --git a/WebCore/bindings/v8/V8Index.cpp b/WebCore/bindings/v8/V8Index.cpp
index 1d2b9c0..5782aac 100644
--- a/WebCore/bindings/v8/V8Index.cpp
+++ b/WebCore/bindings/v8/V8Index.cpp
@@ -404,7 +404,6 @@
 #include "V8SharedWorker.h"
 #endif
 
-<<<<<<< HEAD:WebCore/bindings/v8/V8Index.cpp
 #if ENABLE(GEOLOCATION)
 #include "V8Coordinates.h"
 #include "V8Geolocation.h"
@@ -428,7 +427,8 @@
 
 #if ENABLE(XSLT)
 #include "V8XSLTProcessor.h"
-=======
+#endif
+
 #if ENABLE(3D_CANVAS)
 #include "V8CanvasRenderingContext3D.h"
 #include "V8CanvasArrayBuffer.h"
@@ -446,7 +446,6 @@
 #include "V8CanvasUnsignedByteArray.h"
 #include "V8CanvasUnsignedIntArray.h"
 #include "V8CanvasUnsignedShortArray.h"
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Index.cpp
 #endif
 
 namespace WebCore {
diff --git a/WebCore/bindings/v8/V8Index.h b/WebCore/bindings/v8/V8Index.h
index b73100c..e91ffd7 100644
--- a/WebCore/bindings/v8/V8Index.h
+++ b/WebCore/bindings/v8/V8Index.h
@@ -460,14 +460,16 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
 #define DOM_OBJECT_WORKERS_TYPES(V)
 #endif
 
-<<<<<<< HEAD:WebCore/bindings/v8/V8Index.h
 #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 ENABLE(3D_CANVAS)
 #define DOM_OBJECT_3D_CANVAS_TYPES(V)                                   \
     V(CANVASARRAY, CanvasArray)                                         \
@@ -486,16 +488,10 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
     V(CANVASUNSIGNEDBYTEARRAY, CanvasUnsignedByteArray)                 \
     V(CANVASUNSIGNEDINTARRAY, CanvasUnsignedIntArray)                   \
     V(CANVASUNSIGNEDSHORTARRAY, CanvasUnsignedShortArray)
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Index.h
 #else
-<<<<<<< HEAD:WebCore/bindings/v8/V8Index.h
-#define DOM_OBJECT_GEOLOCATION_TYPES(V)
-=======
 #define DOM_OBJECT_3D_CANVAS_TYPES(V)
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Index.h
 #endif
 
-<<<<<<< HEAD:WebCore/bindings/v8/V8Index.h
 #if ENABLE(TOUCH_EVENTS)
 #define DOM_OBJECT_TOUCH_EVENT_TYPES(V)                                 \
     V(TOUCHLIST, TouchList)                                             \
@@ -506,15 +502,13 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
 #endif
 
 #if PLATFORM(CHROMIUM)
-=======
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Index.h
 #define DOM_OBJECT_TYPES(V)                                             \
     DOM_OBJECT_TYPES_1(V)                                               \
     DOM_OBJECT_TYPES_2(V)                                               \
     DOM_OBJECT_DATABASE_TYPES(V)                                        \
     DOM_OBJECT_STORAGE_TYPES(V)                                         \
     DOM_OBJECT_WORKERS_TYPES(V)                                         \
-<<<<<<< HEAD:WebCore/bindings/v8/V8Index.h
+    DOM_OBJECT_3D_CANVAS_TYPES(V)                                       \
     DOM_OBJECT_XPATH_TYPES(V)                                           \
     DOM_OBJECT_XSLT_TYPES(V)                                            \
     V(INSPECTORBACKEND, InspectorBackend)
@@ -528,9 +522,6 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
     DOM_OBJECT_TOUCH_EVENT_TYPES(V)                                     \
     DOM_OBJECT_WORKERS_TYPES(V)
 #endif
-=======
-    DOM_OBJECT_3D_CANVAS_TYPES(V)
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Index.h
 
 #if ENABLE(SVG)
 // SVG_OBJECT_TYPES are svg non-node, non-pod types.
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp
index 5e0c8b6..fa2370c 100644
--- a/WebCore/bindings/v8/V8Proxy.cpp
+++ b/WebCore/bindings/v8/V8Proxy.cpp
@@ -32,11 +32,8 @@
 #include "V8Proxy.h"
 
 #include "CSSMutableStyleDeclaration.h"
-<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp
 #include "CString.h"
-=======
 #include "DateExtension.h"
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Proxy.cpp
 #include "DOMObjectsInclude.h"
 #include "DocumentLoader.h"
 #include "FrameLoaderClient.h"
@@ -378,24 +375,6 @@ v8::Local<v8::Value> V8Proxy::evaluate(const ScriptSourceCode& source, Node* nod
     ASSERT(v8::Context::InContext());
     LOCK_V8;
 
-<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp
-    // Compile the script.
-    v8::Local<v8::String> code = v8ExternalString(source.source());
-#if PLATFORM(CHROMIUM)
-    // TODO(andreip): ChromeBridge->BrowserBridge?
-    ChromiumBridge::traceEventBegin("v8.compile", node, "");
-#endif
-
-    // NOTE: For compatibility with WebCore, ScriptSourceCode's line starts at
-    // 1, whereas v8 starts at 0.
-    v8::Handle<v8::Script> script = compileScript(code, source.url(), source.startLine() - 1);
-#if PLATFORM(CHROMIUM)
-    // TODO(andreip): ChromeBridge->BrowserBridge?
-    ChromiumBridge::traceEventEnd("v8.compile", node, "");
-    ChromiumBridge::traceEventBegin("v8.run", node, "");
-#endif
-=======
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Proxy.cpp
     v8::Local<v8::Value> result;
     {
         // Isolate exceptions that occur when compiling and executing
@@ -407,14 +386,20 @@ v8::Local<v8::Value> V8Proxy::evaluate(const ScriptSourceCode& source, Node* nod
 
         // Compile the script.
         v8::Local<v8::String> code = v8ExternalString(source.source());
+#if PLATFORM(CHROMIUM)
+        // TODO(andreip): ChromeBridge->BrowserBridge?
         ChromiumBridge::traceEventBegin("v8.compile", node, "");
+#endif
 
         // NOTE: For compatibility with WebCore, ScriptSourceCode's line starts at
         // 1, whereas v8 starts at 0.
         v8::Handle<v8::Script> script = compileScript(code, source.url(), source.startLine() - 1);
+#if PLATFORM(CHROMIUM)
+        // TODO(andreip): ChromeBridge->BrowserBridge?
         ChromiumBridge::traceEventEnd("v8.compile", node, "");
 
         ChromiumBridge::traceEventBegin("v8.run", node, "");
+#endif
         // Set inlineCode to true for <a href="javascript:doSomething()">
         // and false for <script>doSomething</script>. We make a rough guess at
         // this based on whether the script source has a URL.
@@ -496,16 +481,9 @@ v8::Local<v8::Value> V8Proxy::runScriptInternal(v8::Handle<v8::Script> script, b
 
 v8::Local<v8::Value> V8Proxy::callFunction(v8::Handle<v8::Function> function, v8::Handle<v8::Object> receiver, int argc, v8::Handle<v8::Value> args[])
 {
-<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp
 #ifdef ANDROID_INSTRUMENT
     android::TimeCounter::start(android::TimeCounter::JavaScriptExecuteTimeCounter);
 #endif
-
-    // For now, we don't put any artificial limitations on the depth
-    // of recursion that stems from calling functions. This is in
-    // contrast to the script evaluations.
-=======
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Proxy.cpp
     v8::Local<v8::Value> result;
     {
         V8ConsoleMessage::Scope scope;
@@ -817,14 +795,10 @@ void V8Proxy::resetIsolatedWorlds()
 
 void V8Proxy::clearForClose()
 {
-<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp
-    if (!m_context.IsEmpty()) {
-        LOCK_V8;
-=======
     resetIsolatedWorlds();
 
     if (!context().IsEmpty()) {
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Proxy.cpp
+        LOCK_V8;
         v8::HandleScope handleScope;
 
         clearDocumentWrapper();
@@ -837,12 +811,8 @@ void V8Proxy::clearForNavigation()
     disconnectEventListeners();
     resetIsolatedWorlds();
 
-<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp
-    if (!m_context.IsEmpty()) {
-        LOCK_V8;
-=======
     if (!context().IsEmpty()) {
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Proxy.cpp
+        LOCK_V8;
         v8::HandleScope handle;
         clearDocumentWrapper();
 
diff --git a/WebCore/bindings/v8/V8Proxy.h b/WebCore/bindings/v8/V8Proxy.h
index c68f6b7..30f682d 100644
--- a/WebCore/bindings/v8/V8Proxy.h
+++ b/WebCore/bindings/v8/V8Proxy.h
@@ -31,13 +31,6 @@
 #ifndef V8Proxy_h
 #define V8Proxy_h
 
-<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.h
-#include "Node.h"
-#include "NodeFilter.h"
-#include "PlatformString.h" // for WebCore::String
-=======
-#include "ChromiumBridge.h"
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Proxy.h
 #include "ScriptSourceCode.h" // for WebCore::ScriptSourceCode
 #include "SecurityOrigin.h" // for WebCore::SecurityOrigin
 #include "SharedPersistent.h"
@@ -49,12 +42,8 @@
 #include <wtf/PassRefPtr.h> // so generated bindings don't have to
 #include <wtf/Vector.h>
 
-<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.h
 #if defined(ENABLE_DOM_STATS_COUNTERS) && PLATFORM(CHROMIUM)
 #include "ChromiumBridge.h"
-=======
-#ifdef ENABLE_DOM_STATS_COUNTERS
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Proxy.h
 #define INC_STATS(name) ChromiumBridge::incrementStatsCounter(name)
 #else
 #define INC_STATS(name)
@@ -115,11 +104,7 @@ namespace WebCore {
         int group;
         v8::Extension* extension;
     };
-<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.h
-    typedef WTF::Vector<V8ExtensionInfo> V8ExtensionList;
-=======
     typedef WTF::Vector<V8ExtensionInfo> V8Extensions;
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Proxy.h
 
     class V8Proxy {
     public:
diff --git a/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp b/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp
index 8ef65b3..90c1f6f 100644
--- a/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp
+++ b/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp
@@ -403,30 +403,6 @@ v8::Local<v8::Value> WorkerContextExecutionProxy::runScript(v8::Handle<v8::Scrip
     return result;
 }
 
-<<<<<<< HEAD:WebCore/bindings/v8/WorkerContextExecutionProxy.cpp
-PassRefPtr<V8EventListener> WorkerContextExecutionProxy::findOrCreateEventListenerHelper(v8::Local<v8::Value> object, bool isInline, bool findOnly, bool createObjectEventListener)
-{
-    if (!object->IsObject())
-        return 0;
-
-    V8EventListener* listener = m_listeners->find(object->ToObject(), isInline);
-    if (findOnly)
-        return listener;
-
-    // Create a new one, and add to cache.
-    RefPtr<V8EventListener> newListener;
-    if (createObjectEventListener)
-        newListener = V8WorkerContextObjectEventListener::create(this, v8::Local<v8::Object>::Cast(object), isInline);
-    else
-        newListener = V8WorkerContextEventListener::create(this, v8::Local<v8::Object>::Cast(object), isInline);
-
-    m_listeners->add(newListener.get());
-
-    return newListener.release();
-}
-
-=======
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/WorkerContextExecutionProxy.cpp
 PassRefPtr<V8EventListener> WorkerContextExecutionProxy::findOrCreateEventListener(v8::Local<v8::Value> object, bool isInline, bool findOnly)
 {
     return findOnly ? V8EventListenerList::findWrapper(object, isInline) : V8EventListenerList::findOrCreateWrapper<V8WorkerContextEventListener>(this, m_listenerGuard, object, isInline);
diff --git a/WebCore/bindings/v8/custom/V8CustomBinding.h b/WebCore/bindings/v8/custom/V8CustomBinding.h
index 3f381be..82ce1c1 100644
--- a/WebCore/bindings/v8/custom/V8CustomBinding.h
+++ b/WebCore/bindings/v8/custom/V8CustomBinding.h
@@ -626,14 +626,13 @@ namespace WebCore {
         DECLARE_CALLBACK(SharedWorkerConstructor);
 #endif
 
-<<<<<<< HEAD:WebCore/bindings/v8/custom/V8CustomBinding.h
         DECLARE_CALLBACK(GeolocationGetCurrentPosition);
         DECLARE_CALLBACK(GeolocationWatchPosition);
         DECLARE_PROPERTY_ACCESSOR_GETTER(CoordinatesAltitude);
         DECLARE_PROPERTY_ACCESSOR_GETTER(CoordinatesAltitudeAccuracy);
         DECLARE_PROPERTY_ACCESSOR_GETTER(CoordinatesHeading);
         DECLARE_PROPERTY_ACCESSOR_GETTER(CoordinatesSpeed);
-=======
+
 #if ENABLE(WEB_SOCKETS)
         DECLARE_PROPERTY_ACCESSOR(WebSocketOnopen);
         DECLARE_PROPERTY_ACCESSOR(WebSocketOnmessage);
@@ -642,7 +641,6 @@ namespace WebCore {
         DECLARE_CALLBACK(WebSocketSend);
         DECLARE_CALLBACK(WebSocketClose);
 #endif
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/custom/V8CustomBinding.h
 
 #undef DECLARE_INDEXED_ACCESS_CHECK
 #undef DECLARE_NAMED_ACCESS_CHECK
diff --git a/WebCore/bindings/v8/custom/V8DOMApplicationCacheCustom.cpp b/WebCore/bindings/v8/custom/V8DOMApplicationCacheCustom.cpp
index 1b81257..134de95 100644
--- a/WebCore/bindings/v8/custom/V8DOMApplicationCacheCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8DOMApplicationCacheCustom.cpp
@@ -43,66 +43,6 @@
 
 namespace WebCore {
 
-<<<<<<< HEAD:WebCore/bindings/v8/custom/V8DOMApplicationCacheCustom.cpp
-static const bool kFindOnly = true;
-static const bool kFindOrCreate = false;
-
-static PassRefPtr<EventListener> argumentToEventListener(DOMApplicationCache* appcache, v8::Local<v8::Value> value, bool findOnly)
-{
-    V8Proxy* proxy = V8Proxy::retrieve(appcache->scriptExecutionContext());
-    if (proxy)
-        return findOnly ? proxy->objectListeners()->findWrapper(value, false)
-                        : proxy->objectListeners()->findOrCreateWrapper<V8ObjectEventListener>(proxy->frame(), value, false);
-    return 0;
-}
-
-static v8::Local<v8::Object> eventListenerToV8Object(EventListener* listener)
-{
-    return (static_cast<V8ObjectEventListener*>(listener))->getListenerObject();
-}
-
-static inline ApplicationCacheHost::EventID toEventID(v8::Local<v8::String> value)
-{
-    String key = toWebCoreString(value);
-    ASSERT(key.startsWith("on"));
-    return DOMApplicationCache::toEventID(key.substring(2));
-}
-
-// Handles appcache.onfooevent attribute getting
-ACCESSOR_GETTER(DOMApplicationCacheEventHandler)
-{
-    INC_STATS("DOMApplicationCache.onevent_getter");
-    DOMApplicationCache* appcache = V8DOMWrapper::convertToNativeObject<DOMApplicationCache>(V8ClassIndex::DOMAPPLICATIONCACHE, info.Holder());
-    EventListener* listener = appcache->getAttributeEventListener(toEventID(name));
-    if (!listener)
-        return v8::Null();
-    return eventListenerToV8Object(listener);
-}
-
-// Handles appcache.onfooevent attribute setting
-ACCESSOR_SETTER(DOMApplicationCacheEventHandler)
-{
-    INC_STATS("DOMApplicationCache.onevent_setter");
-    DOMApplicationCache* appcache = V8DOMWrapper::convertToNativeObject<DOMApplicationCache>(V8ClassIndex::DOMAPPLICATIONCACHE, info.Holder());
-    ApplicationCacheHost::EventID eventType = toEventID(name);
-
-    if (EventListener* oldListener = appcache->getAttributeEventListener(eventType)) {
-        v8::Local<v8::Object> object = eventListenerToV8Object(oldListener);
-        removeHiddenDependency(info.Holder(), object, V8Custom::kDOMApplicationCacheCacheIndex);
-        appcache->clearAttributeEventListener(eventType);
-    }
-
-    if (value->IsFunction()) {
-        RefPtr<EventListener> newListener = argumentToEventListener(appcache, value, kFindOrCreate);
-        if (newListener) {
-            createHiddenDependency(info.Holder(), value, V8Custom::kDOMApplicationCacheCacheIndex);
-            appcache->setAttributeEventListener(eventType, newListener);
-        }
-    }
-}
-
-=======
->>>>>>> webkit.org at 49305:WebCore/bindings/v8/custom/V8DOMApplicationCacheCustom.cpp
 // Handles appcache.addEventListner(name, func, capture) method calls
 CALLBACK_FUNC_DECL(DOMApplicationCacheAddEventListener)
 {