Move HistoryItem handling to DocumentLoader

third_party/WebKit/Source/core/frame/LocalFrame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
@@ skipping 45 matching lines @@
 #include "core/html/HTMLFrameElementBase.h"
 #include "core/html/HTMLPlugInElement.h"
 #include "core/input/EventHandler.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/layout/HitTestResult.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/api/LayoutPartItem.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
+#include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/loader/NavigationScheduler.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "core/paint/ObjectPainter.h"
 #include "core/paint/PaintInfo.h"
 #include "core/paint/PaintLayer.h"
 #include "core/paint/PaintLayerPainter.h"
@@ skipping 294 matching lines @@
 }
 
 void LocalFrame::navigate(const FrameLoadRequest& request) {
   m_loader.load(request);
 }
 
 void LocalFrame::reload(FrameLoadType loadType,
                         ClientRedirectPolicy clientRedirectPolicy) {
   DCHECK(isReloadLoadType(loadType));
   if (clientRedirectPolicy == ClientRedirectPolicy::NotClientRedirect) {
-    if (!m_loader.currentItem())
+    if (!m_loader.documentLoader()->historyItem())
       return;
     FrameLoadRequest request =
         FrameLoadRequest(nullptr, m_loader.resourceRequestForReload(
                                       loadType, KURL(), clientRedirectPolicy));
     request.setClientRedirect(clientRedirectPolicy);
     m_loader.load(request, loadType);
   } else {
     DCHECK_EQ(FrameLoadTypeReloadMainResource, loadType);
     m_navigationScheduler->scheduleReload();
   }
@@ skipping 522 matching lines @@
   if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
     m_frame->client()->frameBlameContext()->Enter();
 }
 
 ScopedFrameBlamer::~ScopedFrameBlamer() {
   if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
     m_frame->client()->frameBlameContext()->Leave();
 }
 
 }  // namespace blink