Merge webkit.org at R49305 : Fix merge conflicts.

Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a

4 files changed, 1 insertions, 67 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)
 {