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

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

Issue 7945015: Merge 95259 - Fragment navigations should interrupt a provisional load of a different document (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 3 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') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/loader/HistoryController.cpp
===================================================================
--- Source/WebCore/loader/HistoryController.cpp (revision 95471)
+++ Source/WebCore/loader/HistoryController.cpp (working copy)
@@ -524,6 +524,11 @@
if (!m_provisionalItem)
return;
+ // The provisional item may represent a different pending navigation.
+ // Don't commit it if it isn't a same document navigation.
+ if (m_currentItem && !m_currentItem->shouldDoSameDocumentNavigationTo(m_provisionalItem.get()))
+ return;
+
// Commit the provisional item.
m_frameLoadComplete = false;
m_previousItem = m_currentItem;
« no previous file with comments | « Source/WebCore/loader/FrameLoader.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698