third_party/WebKit/WebCore/bindings/js/JSDOMWindowBase.cpp - Issue 20076: WebKit merge 40500:40539 [WebKit side]

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/WebCore/bindings/js/JSDOMWindowBase.cpp

Issue 20076: WebKit merge 40500:40539 [WebKit side] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 11 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp ('k') | third_party/WebKit/WebCore/bindings/js/JSDOMWindowCustom.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/WebCore/bindings/js/JSDOMWindowBase.cpp

===================================================================

--- third_party/WebKit/WebCore/bindings/js/JSDOMWindowBase.cpp (revision 9118)

+++ third_party/WebKit/WebCore/bindings/js/JSDOMWindowBase.cpp (working copy)

@@ -250,7 +250,7 @@

if (created)

newFrame->loader()->changeLocation(completedURL, activeFrame->loader()->outgoingReferrer(), false, userGesture);

else if (!url.isEmpty())

- newFrame->loader()->scheduleLocationChange(completedURL.string(), activeFrame->loader()->outgoingReferrer(), false, false, userGesture);

+ newFrame->loader()->scheduleLocationChange(completedURL.string(), activeFrame->loader()->outgoingReferrer(), !activeFrame->script()->anyPageIsProcessingUserGesture(), false, userGesture);

}

return newFrame;

@@ -790,7 +790,7 @@

const JSDOMWindow* targetedWindow = toJSDOMWindow(frame);

if (!completedURL.isEmpty() && (!protocolIs(completedURL, "javascript") || (targetedWindow && targetedWindow->allowsAccessFrom(exec)))) {

bool userGesture = activeFrame->script()->processingUserGesture();

- frame->loader()->scheduleLocationChange(completedURL, activeFrame->loader()->outgoingReferrer(), false, false, userGesture);

+ frame->loader()->scheduleLocationChange(completedURL, activeFrame->loader()->outgoingReferrer(), !activeFrame->script()->anyPageIsProcessingUserGesture(), false, userGesture);

}

return toJS(exec, frame->domWindow());

}