Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(285)

Unified Diff: Source/WebCore/loader/NavigationScheduler.cpp

Issue 9963061: Merge 112184 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 9 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 | « Source/WebCore/loader/FrameLoader.cpp ('k') | Source/WebCore/page/DOMWindow.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/loader/NavigationScheduler.cpp
===================================================================
--- Source/WebCore/loader/NavigationScheduler.cpp (revision 112895)
+++ Source/WebCore/loader/NavigationScheduler.cpp (working copy)
@@ -227,10 +227,10 @@
// Now that the timer has fired, we need to repeat the security check which normally is done when
// selecting a target, in case conditions have changed. Other code paths avoid this by targeting
// without leaving a time window. If we fail the check just silently drop the form submission.
- Frame* requestingFrame = m_submission->state()->sourceFrame();
- if (!requestingFrame->loader()->shouldAllowNavigation(frame))
+ Document* requestingDocument = m_submission->state()->sourceDocument();
+ if (!requestingDocument->canNavigate(frame))
return;
- FrameLoadRequest frameRequest(requestingFrame->document()->securityOrigin());
+ FrameLoadRequest frameRequest(requestingDocument->document()->securityOrigin());
m_submission->populateFrameLoadRequest(frameRequest);
frame->loader()->loadFrameRequest(frameRequest, lockHistory(), lockBackForwardList(), m_submission->event(), m_submission->state(), MaybeSendReferrer);
}
« no previous file with comments | « Source/WebCore/loader/FrameLoader.cpp ('k') | Source/WebCore/page/DOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698