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/WebTreeScopeType.h"
 
 struct NPObject;
@@ skipping 293 matching lines @@
 
     // Returns the V8 context for associated with the main world and this
     // frame. There can be many V8 contexts associated with this frame, one for
     // each isolated world and one for the main world. If you don't know what
     // the "main world" or an "isolated world" is, then you probably shouldn't
     // be calling this API.
     virtual v8::Local<v8::Context> mainWorldScriptContext() const = 0;
 
     // Navigation ----------------------------------------------------------
 
+    // The type of load for a navigation.
+    // TODO(clamy): Return a WebFrameLoadType instead of a WebHistoryCommitType
+    // in DidCommitProvisionalLoad.
+    enum WebFrameLoadType {

[dcheng, 2015/05/27 16:26:30]

enum class for new enums please. Consider just moving this enum into a
standalone file as well.

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

Done.

+        WebFrameLoadTypeStandard,

[dcheng, 2015/05/27 16:26:30]

Then these can just be "Standard", "Forward", etc.

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

Done.

+        WebFrameLoadTypeBackForward,
+        WebFrameLoadTypeHistorySameDocument,
+        WebFrameLoadTypeReload,
+        WebFrameLoadTypeSame, // user loads same URL again (but not reload button)
+        WebFrameLoadTypeRedirectWithLockedBackForwardList,
+        WebFrameLoadTypeInitialInChildFrame,
+        WebFrameLoadTypeInitialHistoryLoad,

[dcheng, 2015/05/27 16:26:30]

Since we're adding comments anyway... what's the "initial history load"?

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

Done.

+        WebFrameLoadTypeReloadFromOrigin,

[dcheng, 2015/05/27 16:26:30]

How is this different from WebFrameLoadTypeReload?

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

Done.

+    };
+
+    virtual WebURLRequest RequestFromHistoryItem(const WebHistoryItem&, WebURLRequest::CachePolicy)

[dcheng, 2015/05/27 16:26:30]

Blink naming convention is lowerCamelCase for method names.

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

Done.

+        const = 0;
+    virtual WebURLRequest RequestForReload(const WebHistoryItem&, WebFrameLoadType,
+        const WebURL& overrideURL = WebURL()) const = 0;
+    virtual WebHistoryItem CurrentItem() const = 0;
+
     // 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;
+    // TODO(clamy): Remove the reload, reloadWithOverrideURL and loadHistoryItem
+    // functions once RenderFrame only calls loadRequest.
+    virtual void loadRequest(const WebURLRequest&, WebFrameLoadType = WebFrameLoadTypeStandard,

[dcheng, 2015/05/27 16:26:30]

It seems like all the newly added methods should only be on WebLocalFrame.

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

Done.

+        const WebHistoryItem& = WebHistoryItem()) = 0;
 
     // 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