diff options
Diffstat (limited to 'WebCore/bindings/v8/V8Utilities.cpp')
| -rw-r--r-- | WebCore/bindings/v8/V8Utilities.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/WebCore/bindings/v8/V8Utilities.cpp b/WebCore/bindings/v8/V8Utilities.cpp index 2e5cf8b..e497071 100644 --- a/WebCore/bindings/v8/V8Utilities.cpp +++ b/WebCore/bindings/v8/V8Utilities.cpp @@ -38,7 +38,6 @@ #include "ScriptExecutionContext.h" #include "ScriptState.h" #include "V8Binding.h" -#include "V8BindingDOMWindow.h" // FIXME: remove when completeURL moves #include "V8BindingState.h" #include "V8Proxy.h" #include "WorkerContext.h" @@ -112,16 +111,12 @@ bool shouldAllowNavigation(Frame* frame) KURL completeURL(const String& relativeURL) { - return V8BindingDOMWindow::completeURL(V8BindingState::Only(), relativeURL); + return completeURL(V8BindingState::Only(), relativeURL); } void navigateIfAllowed(Frame* frame, const KURL& url, bool lockHistory, bool lockBackForwardList) { - Frame* callingOrEntered = callingOrEnteredFrame(); - if (!callingOrEntered) - return; - if (!protocolIsJavaScript(url) || ScriptController::isSafeScript(frame)) - frame->redirectScheduler()->scheduleLocationChange(url.string(), callingOrEntered->loader()->outgoingReferrer(), lockHistory, lockBackForwardList, processingUserGesture()); + return V8Binding::Frame::navigateIfAllowed(V8BindingState::Only(), frame, url, lockHistory, lockBackForwardList); } ScriptExecutionContext* getScriptExecutionContext() |