Merge 109480

Source/WebCore/loader/FrameLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 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/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ skipping 718 matching lines @@
     // Still waiting for elements that don't go through a FrameLoader?
     if (m_frame->document()->isDelayingLoadEvent())
         return;
 
     // Any frame that hasn't completed yet?
     if (!allChildrenAreComplete())
         return;
 
     // OK, completed.
     m_isComplete = true;
+    m_requestedHistoryItem = 0;
     m_frame->document()->setReadyState(Document::Complete);
 
     RefPtr<Frame> protect(m_frame);
     checkCallImplicitClose(); // if we didn't do it before
 
     m_frame->navigationScheduler()->startTimer();
 
     completed();
     if (m_frame->page())
         checkLoadComplete();
@@ skipping 2410 matching lines @@
         requestForOriginalURL.setURL(itemOriginalURL);
         action = NavigationAction(requestForOriginalURL, loadType, false);
     }
 
     loadWithNavigationAction(request, action, false, loadType, 0);
 }
 
 // Loads content into this frame, as specified by history item
 void FrameLoader::loadItem(HistoryItem* item, FrameLoadType loadType)
 {
+    m_requestedHistoryItem = item;
     HistoryItem* currentItem = history()->currentItem();
     bool sameDocumentNavigation = currentItem && item->shouldDoSameDocumentNavigationTo(currentItem);
 
     if (sameDocumentNavigation)
         loadSameDocumentItem(item);
     else
         loadDifferentDocumentItem(item, loadType);
 }
 
 void FrameLoader::mainReceivedCompleteError(DocumentLoader* loader, const ResourceError&)
@@ skipping 191 matching lines @@
         windowRect.setHeight(features.height + (windowRect.height() - pageSize.height()));
     page->chrome()->setWindowRect(windowRect);
 
     page->chrome()->show();
 
     created = true;
     return frame;
 }
 
 } // namespace WebCore