 Chromium Code Reviews
 Chromium Code Reviews Issue 1156473002:
  Refactor FrameLoader loading interface  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/blink.git@master
    
  
    Issue 1156473002:
  Refactor FrameLoader loading interface  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/blink.git@master| Index: public/web/WebFrame.h | 
| diff --git a/public/web/WebFrame.h b/public/web/WebFrame.h | 
| index f43e83601d011dc08a36a9e62232b35d555a28a6..3845e25cbd9281a4f9702b5c1e61d6facb305f65 100644 | 
| --- a/public/web/WebFrame.h | 
| +++ b/public/web/WebFrame.h | 
| @@ -35,6 +35,7 @@ | 
| #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" | 
| @@ -42,6 +43,7 @@ | 
| #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; | 
| @@ -356,8 +358,13 @@ public: | 
| // 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 ch
 
clamy
2015/06/03 14:39:14
Done. I've also reordered the new methods in Weblo
 | 
| // Load the given history state, corresponding to a back/forward | 
| // navigation of a frame. Multiple frames may be navigated via separate calls. |