Keep frames to navigate alive in HistoryController::goToEntry()

Source/core/page/HistoryController.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 154 matching lines @@
         differentDocumentLoads.set(m_page->mainFrame(), m_provisionalEntry->root());
 
     if (sameDocumentLoads.isEmpty() && differentDocumentLoads.isEmpty())
         sameDocumentLoads.set(m_page->mainFrame(), m_provisionalEntry->root());
 
     if (differentDocumentLoads.isEmpty()) {
         m_previousEntry = m_currentEntry.release();
         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)
 {
     ASSERT(m_provisionalEntry);
     ASSERT(m_currentEntry);
     HistoryItem* newItem = m_provisionalEntry->itemForFrame(frame);
     HistoryItem* oldItem = m_currentEntry->itemForFrame(frame);
     if (!newItem)
         return;
@@ skipping 124 matching lines @@
     } else {
         HistoryItem* oldItem = m_currentEntry->itemForFrame(targetFrame);
         if (!clipAtTarget && oldItem)
             newItem->setDocumentSequenceNumber(oldItem->documentSequenceNumber());
         m_previousEntry = m_currentEntry.release();
         m_currentEntry = m_previousEntry->cloneAndReplace(newItem.get(), clipAtTarget, targetFrame, m_page);
     }
 }
 
 } // namespace WebCore