Refactor FrameLoader loading interface

Source/core/loader/NavigationScheduler.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010 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) 2009 Adam Barth. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
@@ skipping 159 matching lines @@
 class ScheduledReload final : public ScheduledNavigation {
 public:
     static PassOwnPtrWillBeRawPtr<ScheduledReload> create()
     {
         return adoptPtrWillBeNoop(new ScheduledReload);
     }
 
     virtual void fire(LocalFrame* frame) override
     {
         OwnPtr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
-        frame->loader().reload(NormalReload, KURL(), ClientRedirect);
+        if (!frame->loader().currentItem())

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

Null check the ResourceRequest instead of the current item here? It looks
mysterious if you don't know that reloads are initialized based on data from the
current history item.

[clamy, 2015/06/03 14:39:14]

Done.

+            return;
+        FrameLoadRequest request = FrameLoader::frameRequestForReload(
+            frame->loader().resourceRequestForReload(
+                *frame, FrameLoadTypeReload, KURL(), ClientRedirect),
+            ClientRedirect);
+        frame->loader().load(request, FrameLoadTypeReload);
     }
 
 private:
     ScheduledReload()
         : ScheduledNavigation(0.0, nullptr, true, true)
     {
     }
 };
 
 class ScheduledPageBlock final : public ScheduledURLNavigation {
@@ skipping 225 matching lines @@
     m_redirect.clear();
 }
 
 DEFINE_TRACE(NavigationScheduler)
 {
     visitor->trace(m_frame);
     visitor->trace(m_redirect);
 }
 
 } // namespace blink