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

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

Issue 6524014: Merge 78561 - 2011-02-15 Charlie Reis <creis@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 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
Index: Source/WebCore/loader/FrameLoader.cpp
===================================================================
--- Source/WebCore/loader/FrameLoader.cpp (revision 78563)
+++ Source/WebCore/loader/FrameLoader.cpp (working copy)
@@ -1298,6 +1298,9 @@
void FrameLoader::loadURL(const KURL& newURL, const String& referrer, const String& frameName, bool lockHistory, FrameLoadType newLoadType,
PassRefPtr<Event> event, PassRefPtr<FormState> prpFormState)
{
+ if (m_inStopAllLoaders)
+ return;
+
RefPtr<FormState> formState = prpFormState;
bool isFormSubmission = formState;
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | Source/WebCore/manual-tests/navigation-during-onload-triggered-by-back.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698