Drop replacesCurrentHistoryItem, NavigationType

third_party/WebKit/public/web/WebFrameClient.h

Index: third_party/WebKit/public/web/WebFrameClient.h
diff --git a/third_party/WebKit/public/web/WebFrameClient.h b/third_party/WebKit/public/web/WebFrameClient.h
index ef4f788c5720774e67f65571febdfc9a3d144490..1d865ad81a6ab7576dcd240b6609176f8446fd56 100644
--- a/third_party/WebKit/public/web/WebFrameClient.h
+++ b/third_party/WebKit/public/web/WebFrameClient.h
@@ -43,7 +43,6 @@
 #include "WebHistoryItem.h"
 #include "WebIconURL.h"
 #include "WebNavigationPolicy.h"
-#include "WebNavigationType.h"
 #include "WebNavigatorContentUtilsClient.h"
 #include "WebSandboxFlags.h"
 #include "WebTextDirection.h"
@@ -272,7 +271,7 @@ class BLINK_EXPORT WebFrameClient {
   virtual void loadURLExternally(const WebURLRequest&,
                                  WebNavigationPolicy,
                                  const WebString& downloadName,
-                                 bool shouldReplaceCurrentEntry) {}
+                                 WebFrameLoadType loadType) {}
 
   // The client should load an error page in the current frame.
   virtual void loadErrorPage(int reason) {}
@@ -291,10 +290,8 @@ class BLINK_EXPORT WebFrameClient {
     // should stop in blink. In all other cases, the urlRequest should not
     // be modified.
     WebURLRequest& urlRequest;
-    WebNavigationType navigationType;
     WebNavigationPolicy defaultPolicy;
-    bool replacesCurrentHistoryItem;
-    bool isHistoryNavigationInNewChildFrame;
+    WebFrameLoadType loadType;
     bool isClientRedirect;
     WebFormElement form;
     bool isCacheDisabled;
@@ -302,10 +299,8 @@ class BLINK_EXPORT WebFrameClient {
     NavigationPolicyInfo(WebURLRequest& urlRequest)
         : extraData(nullptr),
           urlRequest(urlRequest),
-          navigationType(WebNavigationTypeOther),
           defaultPolicy(WebNavigationPolicyIgnore),
-          replacesCurrentHistoryItem(false),
-          isHistoryNavigationInNewChildFrame(false),
+          loadType(WebFrameLoadType::Standard),
           isClientRedirect(false),
           isCacheDisabled(false) {}
   };
@@ -344,7 +339,7 @@ class BLINK_EXPORT WebFrameClient {
   virtual void didCreateDataSource(WebLocalFrame*, WebDataSource*) {}
 
   // A new provisional load has been started.
-  virtual void didStartProvisionalLoad(WebLocalFrame* localFrame) {}
+  virtual void didStartProvisionalLoad(WebDataSource*, WebFrameLoadType) {}
 
   // The provisional load was redirected via a HTTP 3xx response.
   virtual void didReceiveServerRedirectForProvisionalLoad(WebLocalFrame*) {}
@@ -358,7 +353,8 @@ class BLINK_EXPORT WebFrameClient {
   // The provisional datasource is now committed.  The first part of the
   // response body has been received, and the encoding of the response
   // body is known.
-  virtual void didCommitProvisionalLoad(WebLocalFrame*,
+  virtual void didCommitProvisionalLoad(WebDataSource*,
+                                        WebFrameLoadType,
                                         const WebHistoryItem&,
                                         WebHistoryCommitType) {}
 
@@ -411,7 +407,8 @@ class BLINK_EXPORT WebFrameClient {
   // The navigation resulted in no change to the documents within the page.
   // For example, the navigation may have just resulted in scrolling to a
   // named anchor or a PopState event may have been dispatched.
-  virtual void didNavigateWithinPage(WebLocalFrame*,
+  virtual void didNavigateWithinPage(WebDataSource*,
+                                     WebFrameLoadType,
                                      const WebHistoryItem&,
                                      WebHistoryCommitType,
                                      bool contentInitiated) {}
@@ -530,7 +527,9 @@ class BLINK_EXPORT WebFrameClient {
   // A request is about to be sent out, and the client may modify it.  Request
   // is writable, and changes to the URL, for example, will change the request
   // made.
-  virtual void willSendRequest(WebLocalFrame*, WebURLRequest&) {}
+  virtual void willSendRequest(WebLocalFrame*,
+                               WebURLRequest&,
+                               blink::WebFrameLoadType) {}
 
   // Response headers have been received.
   virtual void didReceiveResponse(const WebURLResponse&) {}