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

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

Issue 1976573002: Only use pending navigation params for browser-initiated navigations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: consistency Created 4 years, 7 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
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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 172
173 void applyUserAgent(ResourceRequest&); 173 void applyUserAgent(ResourceRequest&);
174 174
175 bool allAncestorsAreComplete() const; // including this 175 bool allAncestorsAreComplete() const; // including this
176 176
177 bool shouldClose(bool isReload = false); 177 bool shouldClose(bool isReload = false);
178 void dispatchUnloadEvent(); 178 void dispatchUnloadEvent();
179 179
180 bool allowPlugins(ReasonForCallingAllowPlugins); 180 bool allowPlugins(ReasonForCallingAllowPlugins);
181 181
182 void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSour ce, PassRefPtr<SerializedScriptValue>, HistoryScrollRestorationType, FrameLoadTy pe); 182 void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSour ce, PassRefPtr<SerializedScriptValue>, HistoryScrollRestorationType, FrameLoadTy pe, Document*);
183 183
184 HistoryItem* currentItem() const { return m_currentItem.get(); } 184 HistoryItem* currentItem() const { return m_currentItem.get(); }
185 void saveScrollState(); 185 void saveScrollState();
186 186
187 void restoreScrollPositionAndViewState(); 187 void restoreScrollPositionAndViewState();
188 188
189 bool shouldContinueForNavigationPolicy(const ResourceRequest&, const Substit uteData&, DocumentLoader*, ContentSecurityPolicyDisposition, 189 bool shouldContinueForNavigationPolicy(const ResourceRequest&, const Substit uteData&, DocumentLoader*, ContentSecurityPolicyDisposition,
190 NavigationType, NavigationPolicy, bool shouldReplaceCurrentEntry, bool i sClientRedirect); 190 NavigationType, NavigationPolicy, bool shouldReplaceCurrentEntry, bool i sClientRedirect);
191 191
192 DECLARE_TRACE(); 192 DECLARE_TRACE();
(...skipping 13 matching lines...) Expand all
206 206
207 void startLoad(FrameLoadRequest&, FrameLoadType, NavigationPolicy); 207 void startLoad(FrameLoadRequest&, FrameLoadType, NavigationPolicy);
208 208
209 enum class HistoryNavigationType { 209 enum class HistoryNavigationType {
210 DifferentDocument, 210 DifferentDocument,
211 Fragment, 211 Fragment,
212 HistoryApi 212 HistoryApi
213 }; 213 };
214 void setHistoryItemStateForCommit(HistoryCommitType, HistoryNavigationType); 214 void setHistoryItemStateForCommit(HistoryCommitType, HistoryNavigationType);
215 215
216 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, FrameLoadType, HistoryLoadType, ClientRedirectPolicy); 216 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, FrameLoadType, HistoryLoadType, ClientRedirectPolicy, Document*);
217 217
218 void scheduleCheckCompleted(); 218 void scheduleCheckCompleted();
219 219
220 void detachDocumentLoader(Member<DocumentLoader>&); 220 void detachDocumentLoader(Member<DocumentLoader>&);
221 221
222 PassOwnPtr<TracedValue> toTracedValue() const; 222 PassOwnPtr<TracedValue> toTracedValue() const;
223 void takeObjectSnapshot() const; 223 void takeObjectSnapshot() const;
224 224
225 Member<LocalFrame> m_frame; 225 Member<LocalFrame> m_frame;
226 226
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 282
283 SandboxFlags m_forcedSandboxFlags; 283 SandboxFlags m_forcedSandboxFlags;
284 284
285 bool m_dispatchingDidClearWindowObjectInMainWorld; 285 bool m_dispatchingDidClearWindowObjectInMainWorld;
286 bool m_protectProvisionalLoader; 286 bool m_protectProvisionalLoader;
287 }; 287 };
288 288
289 } // namespace blink 289 } // namespace blink
290 290
291 #endif // FrameLoader_h 291 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/History.cpp ('k') | third_party/WebKit/Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698