Refactor FrameLoader loading interface

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>
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 233 matching lines @@
     // client redirect, which is observable via the webNavigation extension api.
     if (isMainFrame() && !m_loader.stateMachine()->committedFirstRealDocumentLoad()) {
         FrameLoadRequest request(&originDocument, url);
         request.resourceRequest().setHasUserGesture(userGestureStatus == UserGestureStatus::Active);
         m_loader.load(request);
     } else {
         m_navigationScheduler.scheduleLocationChange(&originDocument, url.string(), lockBackForwardList);
     }
 }
 
-void LocalFrame::reload(ReloadPolicy reloadPolicy, ClientRedirectPolicy clientRedirectPolicy)
+void LocalFrame::reload(FrameLoadType loadType, ClientRedirectPolicy clientRedirectPolicy)
 {
-    ASSERT(clientRedirectPolicy == NotClientRedirect || reloadPolicy == NormalReload);
-    if (clientRedirectPolicy == NotClientRedirect)
-        m_loader.reload(reloadPolicy);
-    else
+    ASSERT(loadType == FrameLoadTypeReload || loadType == FrameLoadTypeReloadFromOrigin);
+    ASSERT(clientRedirectPolicy == NotClientRedirect || loadType == FrameLoadTypeReload);
+    if (clientRedirectPolicy == NotClientRedirect) {
+        if (!m_loader.currentItem())
+            return;
+        FrameLoadRequest request = FrameLoadRequest(
+            nullptr, m_loader.resourceRequestForReload(loadType, KURL(), clientRedirectPolicy));
+        request.setClientRedirect(clientRedirectPolicy);
+        m_loader.load(request, loadType);
+    } else {
         m_navigationScheduler.scheduleReload();
+    }
 }
 
 void LocalFrame::detach()
 {
     // A lot of the following steps can result in the current frame being
     // detached, so protect a reference to it.
     RefPtrWillBeRawPtr<LocalFrame> protect(this);
     m_loader.stopAllLoaders();
     m_loader.dispatchUnloadEvent();
     detachChildren();
@@ skipping 541 matching lines @@
     , m_textZoomFactor(parentTextZoomFactor(this))
     , m_inViewSourceMode(false)
 {
     if (isLocalRoot())
         m_instrumentingAgents = InstrumentingAgents::create();
     else
         m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents;
 }
 
 } // namespace blink