Merge 93296 - Prepare frames for history navigation.

Source/WebKit/chromium/src/WebFrameImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 843 matching lines @@
     }
 
     m_frame->loader()->load(resourceRequest, false);
 }
 
 void WebFrameImpl::loadHistoryItem(const WebHistoryItem& item)
 {
     RefPtr<HistoryItem> historyItem = PassRefPtr<HistoryItem>(item);
     ASSERT(historyItem.get());
 
-    // If there is no currentItem, which happens when we are navigating in
-    // session history after a crash, we need to manufacture one otherwise WebKit
-    // hoarks. This is probably the wrong thing to do, but it seems to work.
+    m_frame->loader()->prepareForHistoryNavigation();
     RefPtr<HistoryItem> currentItem = m_frame->loader()->history()->currentItem();
-    if (!currentItem) {
-        currentItem = HistoryItem::create();
-        currentItem->setLastVisitWasFailure(true);
-        m_frame->loader()->history()->setCurrentItem(currentItem.get());
-        m_frame->page()->backForward()->setCurrentItem(currentItem.get());
-    }
-
     m_inSameDocumentHistoryLoad = currentItem->shouldDoSameDocumentNavigationTo(historyItem.get());
     m_frame->page()->goToItem(historyItem.get(),
                               FrameLoadTypeIndexedBackForward);
     m_inSameDocumentHistoryLoad = false;
 }
 
 void WebFrameImpl::loadData(const WebData& data,
                             const WebString& mimeType,
                             const WebString& textEncoding,
                             const WebURL& baseURL,
@@ skipping 1391 matching lines @@
 
     String scriptResult;
     if (!result.getString(scriptResult))
         return;
 
     if (!m_frame->navigationScheduler()->locationChangePending())
         m_frame->document()->loader()->writer()->replaceDocument(scriptResult);
 }
 
 } // namespace WebKit