Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1280)

Unified Diff: third_party/WebKit/WebCore/loader/FrameLoader.h

Issue 20076: WebKit merge 40500:40539 [WebKit side] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/WebCore/loader/EmptyClients.h ('k') | third_party/WebKit/WebCore/loader/FrameLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « third_party/WebKit/WebCore/loader/EmptyClients.h ('k') | third_party/WebKit/WebCore/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698