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

Side by Side Diff: Source/core/loader/FrameLoader.h

Issue 640663003: Ensure that FrameLoadTypeBackForward only occurs once per navigation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: new load type Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
4 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
5 * Copyright (C) 2011 Google Inc. All rights reserved. 5 * Copyright (C) 2011 Google Inc. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 10 *
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 ~FrameLoader(); 74 ~FrameLoader();
75 75
76 void init(); 76 void init();
77 77
78 MixedContentChecker* mixedContentChecker() const { return &m_mixedContentChe cker; } 78 MixedContentChecker* mixedContentChecker() const { return &m_mixedContentChe cker; }
79 ProgressTracker& progress() const { return *m_progressTracker; } 79 ProgressTracker& progress() const { return *m_progressTracker; }
80 80
81 // These functions start a load. All eventually call into loadWithNavigation Action() or loadInSameDocument(). 81 // These functions start a load. All eventually call into loadWithNavigation Action() or loadInSameDocument().
82 void load(const FrameLoadRequest&); // The entry point for non-reload, non-h istory loads. 82 void load(const FrameLoadRequest&); // The entry point for non-reload, non-h istory loads.
83 void reload(ReloadPolicy, const KURL& overrideURL = KURL(), ClientRedirectPo licy = NotClientRedirect); 83 void reload(ReloadPolicy, const KURL& overrideURL = KURL(), ClientRedirectPo licy = NotClientRedirect);
84 void loadHistoryItem(HistoryItem*, HistoryLoadType = HistoryDifferentDocumen tLoad, ResourceRequestCachePolicy = UseProtocolCachePolicy); // The entry point for all back/forward loads 84 void loadHistoryItem(HistoryItem*, FrameLoadType = FrameLoadTypeBackForward,
85 HistoryLoadType = HistoryDifferentDocumentLoad,
86 ResourceRequestCachePolicy = UseProtocolCachePolicy); // The entry point for all back/forward loads
85 87
86 static void reportLocalLoadFailed(LocalFrame*, const String& url); 88 static void reportLocalLoadFailed(LocalFrame*, const String& url);
87 89
88 // FIXME: These are all functions which stop loads. We have too many. 90 // FIXME: These are all functions which stop loads. We have too many.
89 // Warning: stopAllLoaders can and will detach the LocalFrame out from under you. All callers need to either protect the LocalFrame 91 // Warning: stopAllLoaders can and will detach the LocalFrame out from under you. All callers need to either protect the LocalFrame
90 // or guarantee they won't in any way access the LocalFrame after stopAllLoa ders returns. 92 // or guarantee they won't in any way access the LocalFrame after stopAllLoa ders returns.
91 void stopAllLoaders(); 93 void stopAllLoaders();
92 void stopLoading(); 94 void stopLoading();
93 bool closeURL(); 95 bool closeURL();
94 96
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 266
265 bool m_didAccessInitialDocument; 267 bool m_didAccessInitialDocument;
266 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 268 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
267 269
268 SandboxFlags m_forcedSandboxFlags; 270 SandboxFlags m_forcedSandboxFlags;
269 }; 271 };
270 272
271 } // namespace blink 273 } // namespace blink
272 274
273 #endif // FrameLoader_h 275 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698