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 f5a0e0366599c39e4b4a3ddcb51b16f1987cdc8a..fc7df73e8405621b541d6c50fd7ad8626e0bac64 100644
--- a/Source/core/frame/LocalFrame.cpp
+++ b/Source/core/frame/LocalFrame.cpp
@@ -255,10 +255,19 @@ 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/05/27 16:54:33]

We should probably just get rid of the ReloadPolicy enum?

[clamy, 2015/05/29 14:41:50]

Should we change it to a FrameLoadType instead?

[Nate Chapin, 2015/06/02 17:19:35]

Yeah, that was my thought.

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