Refactor FrameLoader loading interface

public/web/WebFrame.h

 /*
  * Copyright (C) 2009 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 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebFrame_h
 #define WebFrame_h
 
 #include "WebCompositionUnderline.h"
 #include "WebHistoryItem.h"
 #include "WebIconURL.h"
 #include "WebNode.h"
+#include "WebSerializedScriptValue.h"
 #include "WebURLLoaderOptions.h"
 #include "public/platform/WebCanvas.h"
 #include "public/platform/WebMessagePortChannel.h"
 #include "public/platform/WebPrivateOwnPtr.h"
 #include "public/platform/WebReferrerPolicy.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLRequest.h"
+#include "public/web/WebFrameLoadType.h"
 #include "public/web/WebTreeScopeType.h"
 
 struct NPObject;
 
 namespace v8 {
 class Context;
 class Function;
 class Object;
 class Value;
 template <class T> class Local;
@@ skipping 294 matching lines @@
     // Navigation ----------------------------------------------------------
 
     // Reload the current document.
     // True |ignoreCache| explicitly bypasses caches.
     // False |ignoreCache| revalidates any existing cache entries.
     virtual void reload(bool ignoreCache = false) = 0;
 
     // This is used for situations where we want to reload a different URL because of a redirect.
     virtual void reloadWithOverrideURL(const WebURL& overrideUrl, bool ignoreCache = false) = 0;
 
-    // Load the given URL.
-    virtual void loadRequest(const WebURLRequest&) = 0;
+    // Load the given URL. For history navigations, a valid WebHistoryItem
+    // should be given, as well as a WebHistoryLoadType.
+    // TODO(clamy): Remove the reload, reloadWithOverrideURL and loadHistoryItem
+    // functions once RenderFrame only calls loadRequest.
+    virtual void loadRequest(const WebURLRequest&, WebFrameLoadType = Standard,
+        const WebHistoryItem& = WebHistoryItem(),
+        WebHistoryLoadType = WebHistoryDifferentDocumentLoad) = 0;

[dcheng, 2015/06/02 18:42:02]

Since we're changing this interface anyway, any chance we can just define the
new interface on WebLocalFrame and have callers switch to that, so we can remove
WebFrame::loadRequest completely?

That way, we won't need the default parameters for compile compatibility across
Blink rolls either.

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

Done. I've also reordered the new methods in WeblocalFrameImpl so that they fall
under the WebLocalFrame implementation.

 
     // Load the given history state, corresponding to a back/forward
     // navigation of a frame. Multiple frames may be navigated via separate calls.
     virtual void loadHistoryItem(
         const WebHistoryItem&,
         WebHistoryLoadType,
         WebURLRequest::CachePolicy = WebURLRequest::UseProtocolCachePolicy) = 0;
 
     // Loads the given data with specific mime type and optional text
     // encoding.  For HTML data, baseURL indicates the security origin of
@@ skipping 361 matching lines @@
     WebPrivateOwnPtr<OpenedFrameTracker> m_openedFrameTracker;
 };
 
 #if BLINK_IMPLEMENTATION
 Frame* toCoreFrame(const WebFrame*);
 #endif
 
 } // namespace blink
 
 #endif