Refactor FrameLoader loading interface

Source/core/frame/LocalFrame.cpp

Index: Source/core/frame/LocalFrame.cpp
diff --git a/Source/core/frame/LocalFrame.cpp b/Source/core/frame/LocalFrame.cpp
index e095caa1102c865d686361d31d8f270f57609e69..2639d9408658c38c0fbc53d59b471618ad89f688 100644
--- a/Source/core/frame/LocalFrame.cpp
+++ b/Source/core/frame/LocalFrame.cpp
@@ -254,10 +254,18 @@ void LocalFrame::navigate(Document& originDocument, const KURL& url, bool lockBa
 void LocalFrame::reload(ReloadPolicy reloadPolicy, ClientRedirectPolicy clientRedirectPolicy)
 {
     ASSERT(clientRedirectPolicy == NotClientRedirect || reloadPolicy == NormalReload);
-    if (clientRedirectPolicy == NotClientRedirect)
-        m_loader.reload(reloadPolicy);
-    else
+    if (clientRedirectPolicy == NotClientRedirect) {
+        if (!m_loader.currentItem())
+            return;
+        FrameLoadType loadType = reloadPolicy == NormalReload ?

[Nate Chapin, 2015/06/04 23:23:09]

ReloadPolicy is still used here, is that an oversight or an intentional
decision?

[clamy, 2015/06/05 14:11:48]

Done. This was an oversight :).

+            FrameLoadTypeReload : FrameLoadTypeReloadFromOrigin;
+        FrameLoadRequest request = FrameLoader::frameRequestForReload(
+            m_loader.resourceRequestForReload(loadType, KURL(), clientRedirectPolicy),
+            clientRedirectPolicy);
+        m_loader.load(request, loadType);
+    } else {
         m_navigationScheduler.scheduleReload();
+    }
 }
 
 void LocalFrame::detach()