Refactor FrameLoader loading interface

Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 53 matching lines @@
 #include "core/html/HTMLPlugInElement.h"
 #include "core/html/HTMLTextAreaElement.h"
 #include "core/html/canvas/WebGLRenderingContext.h"
 #include "core/html/forms/PopupMenuClient.h"
 #include "core/html/ime/InputMethodContext.h"
 #include "core/layout/LayoutPart.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/TextAutosizer.h"
 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h"
 #include "core/loader/DocumentLoader.h"
+#include "core/loader/FrameLoadRequest.h"
 #include "core/loader/FrameLoader.h"
 #include "core/page/Chrome.h"
 #include "core/page/ContextMenuController.h"
 #include "core/page/ContextMenuProvider.h"
 #include "core/page/DragController.h"
 #include "core/page/DragData.h"
 #include "core/page/DragSession.h"
 #include "core/page/EventHandler.h"
 #include "core/page/FocusController.h"
 #include "core/page/FrameTree.h"
@@ skipping 2763 matching lines @@
     if (!m_page)
         return;
 
     // Only change override encoding, don't change default encoding.
     // Note that the new encoding must be 0 if it isn't supposed to be set.
     AtomicString newEncodingName;
     if (!encodingName.isEmpty())
         newEncodingName = encodingName;
     m_page->frameHost().setOverrideEncoding(newEncodingName);
 
-    if (m_page->mainFrame()->isLocalFrame())
-        m_page->deprecatedLocalMainFrame()->loader().reload(NormalReload);
+    if (m_page->mainFrame()->isLocalFrame()) {
+        if (!m_page->deprecatedLocalMainFrame()->loader().currentItem())
+            return;
+        FrameLoadRequest request = FrameLoader::frameRequestForReload(
+            FrameLoader::resourceRequestForReload(
+                m_page->deprecatedLocalMainFrame()->loader().currentItem(),
+                *m_page->deprecatedLocalMainFrame(), FrameLoadTypeReload, KURL(), ClientRedirect),
+            ClientRedirect);
+        m_page->deprecatedLocalMainFrame()->loader().load(request, FrameLoadTypeReload);
+    }
 }
 
 WebFrame* WebViewImpl::mainFrame()
 {
     return WebFrame::fromFrame(m_page ? m_page->mainFrame() : 0);
 }
 
 WebFrame* WebViewImpl::findFrameByName(
     const WebString& name, WebFrame* relativeToFrame)
 {
@@ skipping 1660 matching lines @@
     return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
         || (constraints.minimumScale == constraints.maximumScale && constraints.minimumScale != -1);
 }
 
 void WebViewImpl::forceNextWebGLContextCreationToFail()
 {
     WebGLRenderingContext::forceNextWebGLContextCreationToFail();
 }
 
 } // namespace blink