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

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

Issue 2655143002: Drop replacesCurrentHistoryItem, NavigationType (Closed)
Patch Set: More compile fixes Created 3 years, 10 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. 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
4 * (http://www.torchmobile.com/) 4 * (http://www.torchmobile.com/)
5 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 5 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
6 * Copyright (C) 2011 Google Inc. All rights reserved. 6 * Copyright (C) 2011 Google Inc. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 198
199 HistoryItem* currentItem() const { return m_currentItem.get(); } 199 HistoryItem* currentItem() const { return m_currentItem.get(); }
200 void saveScrollState(); 200 void saveScrollState();
201 201
202 void restoreScrollPositionAndViewState(); 202 void restoreScrollPositionAndViewState();
203 203
204 bool shouldContinueForNavigationPolicy(const ResourceRequest&, 204 bool shouldContinueForNavigationPolicy(const ResourceRequest&,
205 const SubstituteData&, 205 const SubstituteData&,
206 DocumentLoader*, 206 DocumentLoader*,
207 ContentSecurityPolicyDisposition, 207 ContentSecurityPolicyDisposition,
208 NavigationType,
209 NavigationPolicy, 208 NavigationPolicy,
210 FrameLoadType, 209 FrameLoadType,
211 bool isClientRedirect, 210 bool isClientRedirect,
212 HTMLFormElement*); 211 HTMLFormElement*);
213 212
214 // PlzNavigate: Navigations handled by the client are treated as 213 // PlzNavigate: Navigations handled by the client are treated as
215 // provisional navigations. 214 // provisional navigations.
216 bool hasProvisionalNavigation() const { 215 bool hasProvisionalNavigation() const {
217 return provisionalDocumentLoader() || m_isNavigationHandledByClient; 216 return provisionalDocumentLoader() || m_isNavigationHandledByClient;
218 } 217 }
(...skipping 13 matching lines...) Expand all
232 FrameLoadType determineFrameLoadType(const FrameLoadRequest&); 231 FrameLoadType determineFrameLoadType(const FrameLoadRequest&);
233 232
234 SubstituteData defaultSubstituteDataForURL(const KURL&); 233 SubstituteData defaultSubstituteDataForURL(const KURL&);
235 234
236 bool shouldPerformFragmentNavigation(bool isFormSubmission, 235 bool shouldPerformFragmentNavigation(bool isFormSubmission,
237 const String& httpMethod, 236 const String& httpMethod,
238 FrameLoadType, 237 FrameLoadType,
239 const KURL&); 238 const KURL&);
240 void processFragment(const KURL&, FrameLoadType, LoadStartType); 239 void processFragment(const KURL&, FrameLoadType, LoadStartType);
241 240
242 bool checkLoadCanStart(FrameLoadRequest&, 241 bool checkLoadCanStart(FrameLoadRequest&, FrameLoadType, NavigationPolicy);
243 FrameLoadType,
244 NavigationPolicy,
245 NavigationType);
246 void startLoad(FrameLoadRequest&, FrameLoadType, NavigationPolicy); 242 void startLoad(FrameLoadRequest&, FrameLoadType, NavigationPolicy);
247 243
248 enum class HistoryNavigationType { DifferentDocument, Fragment, HistoryApi }; 244 enum class HistoryNavigationType { DifferentDocument, Fragment, HistoryApi };
249 void setHistoryItemStateForCommit(FrameLoadType, 245 void setHistoryItemStateForCommit(FrameLoadType,
250 HistoryCommitType, 246 HistoryCommitType,
251 HistoryNavigationType); 247 HistoryNavigationType);
252 248
253 void loadInSameDocument(const KURL&, 249 void loadInSameDocument(const KURL&,
254 PassRefPtr<SerializedScriptValue> stateObject, 250 PassRefPtr<SerializedScriptValue> stateObject,
255 FrameLoadType, 251 FrameLoadType,
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 SandboxFlags m_forcedSandboxFlags; 322 SandboxFlags m_forcedSandboxFlags;
327 323
328 bool m_dispatchingDidClearWindowObjectInMainWorld; 324 bool m_dispatchingDidClearWindowObjectInMainWorld;
329 bool m_protectProvisionalLoader; 325 bool m_protectProvisionalLoader;
330 bool m_isNavigationHandledByClient; 326 bool m_isNavigationHandledByClient;
331 }; 327 };
332 328
333 } // namespace blink 329 } // namespace blink
334 330
335 #endif // FrameLoader_h 331 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameFetchContext.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