diff options
Diffstat (limited to 'WebCore/bindings/generic/BindingDOMWindow.h')
| -rw-r--r-- | WebCore/bindings/generic/BindingDOMWindow.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/WebCore/bindings/generic/BindingDOMWindow.h b/WebCore/bindings/generic/BindingDOMWindow.h index 96b8b9d..3568e6c 100644 --- a/WebCore/bindings/generic/BindingDOMWindow.h +++ b/WebCore/bindings/generic/BindingDOMWindow.h @@ -119,12 +119,10 @@ Frame* BindingDOMWindow<Binding>::createWindow(State<Binding>* state, if (!protocolIsJavaScript(url) || BindingSecurity<Binding>::canAccessFrame(state, newFrame, true)) { KURL completedUrl = url.isEmpty() ? KURL(ParsedURLString, "") : completeURL(state, url); - bool userGesture = state->processingUserGesture(); - if (created) - newFrame->loader()->changeLocation(completedUrl, referrer, false, false, userGesture); + newFrame->loader()->changeLocation(completedUrl, referrer, false, false); else if (!url.isEmpty()) - newFrame->redirectScheduler()->scheduleLocationChange(completedUrl.string(), referrer, false, false, userGesture); + newFrame->navigationScheduler()->scheduleLocationChange(completedUrl.string(), referrer, false, false); } return newFrame; @@ -187,13 +185,11 @@ WebCore::DOMWindow* BindingDOMWindow<Binding>::open(State<Binding>* state, if (!completedUrl.isEmpty() && (!protocolIsJavaScript(completedUrl) || BindingSecurity<Binding>::canAccessFrame(state, frame, true))) { - bool userGesture = state->processingUserGesture(); - // For whatever reason, Firefox uses the first frame to determine // the outgoingReferrer. We replicate that behavior here. String referrer = firstFrame->loader()->outgoingReferrer(); - frame->redirectScheduler()->scheduleLocationChange(completedUrl, referrer, false, false, userGesture); + frame->navigationScheduler()->scheduleLocationChange(completedUrl, referrer, false, false); } return frame->domWindow(); } |