WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/loader/FrameLoader.h

Index: third_party/WebKit/WebCore/loader/FrameLoader.h
===================================================================
--- third_party/WebKit/WebCore/loader/FrameLoader.h	(revision 9118)
+++ third_party/WebKit/WebCore/loader/FrameLoader.h	(working copy)
@@ -137,21 +137,21 @@
         void load(DocumentLoader*);                                                                 // Calls loadWithDocumentLoader   
 
         void loadWithNavigationAction(const ResourceRequest&, const NavigationAction&,              // Calls loadWithDocumentLoader()
-            FrameLoadType, PassRefPtr<FormState>);
+            bool lockHistory, FrameLoadType, PassRefPtr<FormState>);
 
         void loadPostRequest(const ResourceRequest&, const String& referrer,                        // Called by loadFrameRequestWithFormAndValues(), calls loadWithNavigationAction
-            const String& frameName, FrameLoadType, Event*, PassRefPtr<FormState>);
+            const String& frameName, bool lockHistory, FrameLoadType, Event*, PassRefPtr<FormState>);
 
         void loadURL(const KURL& newURL, const String& referrer, const String& frameName,           // Called by loadFrameRequestWithFormAndValues(), calls loadWithNavigationAction or else dispatches to navigation policy delegate    
-            FrameLoadType, Event*, PassRefPtr<FormState>);                                                         
+            bool lockHistory, FrameLoadType, Event*, PassRefPtr<FormState>);                                                         
         void loadURLIntoChildFrame(const KURL&, const String& referer, Frame*);
 
         void loadFrameRequestWithFormAndValues(const FrameLoadRequest&, bool lockHistory, bool lockBackForwardList,           // Called by submitForm, calls loadPostRequest()
             Event*, HTMLFormElement*, const HashMap<String, String>& formValues);
 
-        void load(const ResourceRequest&);                                                          // Called by WebFrame, calls (ResourceRequest, SubstituteData)
-        void load(const ResourceRequest&, const SubstituteData&);                                   // Called both by WebFrame and internally, calls (DocumentLoader*)
-        void load(const ResourceRequest&, const String& frameName);                                 // Called by WebPluginController
+        void load(const ResourceRequest&, bool lockHistory);                                                          // Called by WebFrame, calls (ResourceRequest, SubstituteData)
+        void load(const ResourceRequest&, const SubstituteData&, bool lockHistory);                                   // Called both by WebFrame and internally, calls (DocumentLoader*)
+        void load(const ResourceRequest&, const String& frameName, bool lockHistory);                                 // Called by WebPluginController
         
         void loadArchive(PassRefPtr<Archive> archive);
 
@@ -254,7 +254,7 @@
         void didFirstVisuallyNonEmptyLayout();
 
         void clientRedirectCancelledOrFinished(bool cancelWithLoadInProgress);
-        void clientRedirected(const KURL&, double delay, double fireDate, bool lockHistory, bool lockBackForwardList, bool isJavaScriptFormAction);
+        void clientRedirected(const KURL&, double delay, double fireDate, bool lockBackForwardList, bool isJavaScriptFormAction);
         bool shouldReload(const KURL& currentURL, const KURL& destinationURL);
 #if ENABLE(WML)
         void setForceReloadWmlDeck(bool);
@@ -479,7 +479,7 @@
         void updateHistoryForBackForwardNavigation();
         void updateHistoryForReload();
         void updateHistoryForStandardLoad();
-        void updateHistoryForRedirectWithLockedHistory();
+        void updateHistoryForRedirectWithLockedBackForwardList();
         void updateHistoryForClientRedirect();
         void updateHistoryForCommit();
         void updateHistoryForAnchorScroll();