Index: Source/core/page/HistoryController.cpp |
diff --git a/Source/core/page/HistoryController.cpp b/Source/core/page/HistoryController.cpp |
index cb963d6c45926d15bc63505a5a6885014469159f..3f317f3a46b7a728db72e6e3196d152ffff94f94 100644 |
--- a/Source/core/page/HistoryController.cpp |
+++ b/Source/core/page/HistoryController.cpp |
@@ -172,10 +172,14 @@ void HistoryController::goToEntry(PassOwnPtr<HistoryEntry> targetEntry, Resource |
m_currentEntry = m_provisionalEntry.release(); |
} |
- for (HistoryFrameLoadSet::iterator it = sameDocumentLoads.begin(); it != sameDocumentLoads.end(); ++it) |
- it->key->loader().loadHistoryItem(it->value, HistorySameDocumentLoad, cachePolicy); |
- for (HistoryFrameLoadSet::iterator it = differentDocumentLoads.begin(); it != differentDocumentLoads.end(); ++it) |
- it->key->loader().loadHistoryItem(it->value, HistoryDifferentDocumentLoad, cachePolicy); |
+ for (HistoryFrameLoadSet::iterator it = sameDocumentLoads.begin(); it != sameDocumentLoads.end(); ++it) { |
+ if (it->key->host()) |
+ it->key->loader().loadHistoryItem(it->value, HistorySameDocumentLoad, cachePolicy); |
+ } |
+ for (HistoryFrameLoadSet::iterator it = differentDocumentLoads.begin(); it != differentDocumentLoads.end(); ++it) { |
+ if (it->key->host()) |
+ it->key->loader().loadHistoryItem(it->value, HistoryDifferentDocumentLoad, cachePolicy); |
+ } |
} |
void HistoryController::recursiveGoToEntry(Frame* frame, HistoryFrameLoadSet& sameDocumentLoads, HistoryFrameLoadSet& differentDocumentLoads) |