diff options
Diffstat (limited to 'WebCore/bindings/js')
| -rw-r--r-- | WebCore/bindings/js/ScriptController.h | 3 |
1 files changed, 0 insertions, 3 deletions
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(); |