Drop replacesCurrentHistoryItem, NavigationType

content/renderer/render_frame_impl.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 517 matching lines @@
   void setHasReceivedUserGesture() override;
   bool shouldReportDetailedMessageForSource(
       const blink::WebString& source) override;
   void didAddMessageToConsole(const blink::WebConsoleMessage& message,
                               const blink::WebString& source_name,
                               unsigned source_line,
                               const blink::WebString& stack_trace) override;
   void loadURLExternally(const blink::WebURLRequest& request,
                          blink::WebNavigationPolicy policy,
                          const blink::WebString& suggested_name,
-                         bool should_replace_current_entry) override;
+                         blink::WebFrameLoadType load_type) override;
   void loadErrorPage(int reason) override;
   blink::WebNavigationPolicy decidePolicyForNavigation(
       const NavigationPolicyInfo& info) override;
   blink::WebHistoryItem historyItemForNewChildFrame() override;
   void willSendSubmitEvent(const blink::WebFormElement& form) override;
   void willSubmitForm(const blink::WebFormElement& form) override;
   void didCreateDataSource(blink::WebLocalFrame* frame,
                            blink::WebDataSource* datasource) override;
-  void didStartProvisionalLoad(blink::WebLocalFrame* frame) override;
+  void didStartProvisionalLoad(blink::WebDataSource* ds,
+                               blink::WebFrameLoadType type) override;
   void didReceiveServerRedirectForProvisionalLoad(
       blink::WebLocalFrame* frame) override;
   void didFailProvisionalLoad(blink::WebLocalFrame* frame,
                               const blink::WebURLError& error,
                               blink::WebHistoryCommitType commit_type) override;
   void didCommitProvisionalLoad(
-      blink::WebLocalFrame* frame,
+      blink::WebDataSource* data_source,
+      blink::WebFrameLoadType load_type,
       const blink::WebHistoryItem& item,
       blink::WebHistoryCommitType commit_type) override;
   void didCreateNewDocument(blink::WebLocalFrame* frame) override;
   void didClearWindowObject(blink::WebLocalFrame* frame) override;
   void didCreateDocumentElement(blink::WebLocalFrame* frame) override;
   void runScriptsAtDocumentElementAvailable(
       blink::WebLocalFrame* frame) override;
   void didReceiveTitle(blink::WebLocalFrame* frame,
                        const blink::WebString& title,
                        blink::WebTextDirection direction) override;
   void didChangeIcon(blink::WebLocalFrame* frame,
                      blink::WebIconURL::Type icon_type) override;
   void didFinishDocumentLoad(blink::WebLocalFrame* frame) override;
   void runScriptsAtDocumentReady(blink::WebLocalFrame* frame,
                                  bool document_is_empty) override;
   void didHandleOnloadEvents(blink::WebLocalFrame* frame) override;
   void didFailLoad(blink::WebLocalFrame* frame,
                    const blink::WebURLError& error,
                    blink::WebHistoryCommitType commit_type) override;
   void didFinishLoad(blink::WebLocalFrame* frame) override;
-  void didNavigateWithinPage(blink::WebLocalFrame* frame,
+  void didNavigateWithinPage(blink::WebDataSource* data_source,
+                             blink::WebFrameLoadType load_type,
                              const blink::WebHistoryItem& item,
                              blink::WebHistoryCommitType commit_type,
                              bool content_initiated) override;
   void didUpdateCurrentHistoryItem() override;
   void didChangeThemeColor() override;
   void dispatchLoad() override;
   blink::WebEffectiveConnectionType getEffectiveConnectionType() override;
   void didChangeSelection(bool is_empty_selection) override;
   bool handleCurrentKeyboardEvent() override;
   blink::WebColorChooser* createColorChooser(
       blink::WebColorChooserClient* client,
       const blink::WebColor& initial_color,
       const blink::WebVector<blink::WebColorSuggestion>& suggestions) override;
   void runModalAlertDialog(const blink::WebString& message) override;
   bool runModalConfirmDialog(const blink::WebString& message) override;
   bool runModalPromptDialog(const blink::WebString& message,
                             const blink::WebString& default_value,
                             blink::WebString* actual_value) override;
   bool runModalBeforeUnloadDialog(bool is_reload) override;
   bool runFileChooser(
       const blink::WebFileChooserParams& params,
       blink::WebFileChooserCompletion* chooser_completion) override;
   void showContextMenu(const blink::WebContextMenuData& data) override;
   void saveImageFromDataURL(const blink::WebString& data_url) override;
   void willSendRequest(blink::WebLocalFrame* frame,
-                       blink::WebURLRequest& request) override;
+                       blink::WebURLRequest& request,
+                       blink::WebFrameLoadType load_type) override;
   void didReceiveResponse(const blink::WebURLResponse& response) override;
   void didLoadResourceFromMemoryCache(
       const blink::WebURLRequest& request,
       const blink::WebURLResponse& response) override;
   void didDisplayInsecureContent() override;
   void didRunInsecureContent(const blink::WebSecurityOrigin& origin,
                              const blink::WebURL& target) override;
   void didDisplayContentWithCertificateErrors(
       const blink::WebURL& url) override;
   void didRunContentWithCertificateErrors(const blink::WebURL& url) override;
@@ skipping 174 matching lines @@
   void BindToWebFrame(blink::WebLocalFrame* web_frame);
 
   // Functions to add and remove observers for this object.
   void AddObserver(RenderFrameObserver* observer);
   void RemoveObserver(RenderFrameObserver* observer);
 
   bool IsLocalRoot() const;
   const RenderFrameImpl* GetLocalRoot() const;
 
   // Builds and sends DidCommitProvisionalLoad to the host.
-  void SendDidCommitProvisionalLoad(blink::WebFrame* frame,
-                                    blink::WebHistoryCommitType commit_type,
+  void SendDidCommitProvisionalLoad(blink::WebDataSource* data_source,
+                                    blink::WebFrameLoadType load_type,
                                     const blink::WebHistoryItem& item);
 
   // Swaps the current frame into the frame tree, replacing the
   // RenderFrameProxy it is associated with.  Return value indicates whether
   // the swap operation succeeded.  This should only be used for provisional
   // frames associated with a proxy, while the proxy is still in the frame
   // tree.  If the associated proxy has been detached before this is called,
   // this returns false and aborts the swap.
   bool SwapIn();
 
@@ skipping 121 matching lines @@
   // |is_history_navigation_in_new_child| is true, the browser process should
   // look for a matching FrameNavigationEntry in the last committed entry to use
   // instead of |url|.
   void OpenURL(
       const GURL& url,
       bool uses_post,
       const scoped_refptr<ResourceRequestBodyImpl>& resource_request_body,
       const std::string& extra_headers,
       const Referrer& referrer,
       blink::WebNavigationPolicy policy,
-      bool should_replace_current_entry,
-      bool is_history_navigation_in_new_child);
+      blink::WebFrameLoadType load_type);
 
   // Performs a navigation in the frame. This provides a unified function for
   // the current code path and the browser-side navigation path (in
   // development). Currently used by OnNavigate, with all *NavigationParams
   // provided by the browser. |stream_params| should be null.
   // PlzNavigate: used by OnCommitNavigation, with |common_params| and
   // |request_params| received by the browser. |stream_params| should be non
   // null and created from the information provided by the browser.
   // |start_params| is not used.
   void NavigateInternal(
@@ skipping 426 matching lines @@
   bool browser_side_navigation_pending_ = false;
 
   base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_