From 3f60c26c3fa9dc89d57ef4db083a4f13ef86c103 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 5 Nov 2009 18:34:51 +0000 Subject: Merge webkit.org at r50258 : Fix conflicts. Note that FrameLoader::gotoAnchor has been moved to FramveView::gotoAnchor. See http://trac.webkit.org/changeset/49608 Change-Id: Ic2a87bb0c0f91d371508578ddccf200967524a77 --- WebCore/bindings/js/ScriptController.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'WebCore/bindings/js') diff --git a/WebCore/bindings/js/ScriptController.h b/WebCore/bindings/js/ScriptController.h index 60b18d9..f2a497d 100644 --- a/WebCore/bindings/js/ScriptController.h +++ b/WebCore/bindings/js/ScriptController.h @@ -90,8 +90,6 @@ public: m_windowShells.remove(world); } -<<<<<<< HEAD:WebCore/bindings/js/ScriptController.h -======= ScriptValue executeScript(const ScriptSourceCode&); ScriptValue executeScript(const String& script, bool forceUserGesture = false); ScriptValue executeScriptInIsolatedWorld(unsigned worldID, const String& script, bool forceUserGesture = false); @@ -100,7 +98,6 @@ public: // Returns true if argument is a JavaScript URL. bool executeIfJavaScriptURL(const KURL&, bool userGesture = false, bool replaceDocument = true); ->>>>>>> webkit.org at r50258.:WebCore/bindings/js/ScriptController.h // This function must be called from the main thread. It is safe to call it repeatedly. // Darwin is an exception to this rule: it is OK to call this function from any thread, even reentrantly. static void initializeThreading(); -- cgit v1.1