diff options
| author | Steve Block <steveblock@google.com> | 2009-11-05 18:34:51 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-11-10 22:41:13 +0000 |
| commit | 3f60c26c3fa9dc89d57ef4db083a4f13ef86c103 (patch) | |
| tree | 81c16accd4c9b2b2e4e29ec18b9e5fa7eb37ed93 /WebCore/bindings/js | |
| parent | cac0f67c402d107cdb10971b95719e2ff9c7c76b (diff) | |
| download | external_webkit-3f60c26c3fa9dc89d57ef4db083a4f13ef86c103.zip external_webkit-3f60c26c3fa9dc89d57ef4db083a4f13ef86c103.tar.gz external_webkit-3f60c26c3fa9dc89d57ef4db083a4f13ef86c103.tar.bz2 | |
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
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(); |