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

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

Issue 126453005: Simplify starting a same-document navigation (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/DocumentLoader.cpp ('k') | 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 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 void checkTimerFired(Timer<FrameLoader>*); 211 void checkTimerFired(Timer<FrameLoader>*);
212 void didAccessInitialDocumentTimerFired(Timer<FrameLoader>*); 212 void didAccessInitialDocumentTimerFired(Timer<FrameLoader>*);
213 213
214 bool prepareRequestForThisFrame(FrameLoadRequest&); 214 bool prepareRequestForThisFrame(FrameLoadRequest&);
215 void setReferrerForFrameRequest(ResourceRequest&, ShouldSendReferrer, Docume nt*); 215 void setReferrerForFrameRequest(ResourceRequest&, ShouldSendReferrer, Docume nt*);
216 FrameLoadType determineFrameLoadType(const FrameLoadRequest&); 216 FrameLoadType determineFrameLoadType(const FrameLoadRequest&);
217 bool isScriptTriggeredFormSubmissionInChildFrame(const FrameLoadRequest&) co nst; 217 bool isScriptTriggeredFormSubmissionInChildFrame(const FrameLoadRequest&) co nst;
218 218
219 SubstituteData defaultSubstituteDataForURL(const KURL&); 219 SubstituteData defaultSubstituteDataForURL(const KURL&);
220 220
221 void checkNavigationPolicyAndContinueFragmentScroll(const NavigationAction&, bool isNewNavigation, ClientRedirectPolicy);
222
223 bool shouldPerformFragmentNavigation(bool isFormSubmission, const String& ht tpMethod, FrameLoadType, const KURL&); 221 bool shouldPerformFragmentNavigation(bool isFormSubmission, const String& ht tpMethod, FrameLoadType, const KURL&);
224 void scrollToFragmentWithParentBoundary(const KURL&); 222 void scrollToFragmentWithParentBoundary(const KURL&);
225 223
226 void checkLoadCompleteForThisFrame(); 224 void checkLoadCompleteForThisFrame();
227 225
228 // Calls continueLoadAfterNavigationPolicy 226 // Calls continueLoadAfterNavigationPolicy
229 void loadWithNavigationAction(const NavigationAction&, FrameLoadType, PassRe fPtr<FormState>, 227 void loadWithNavigationAction(const NavigationAction&, FrameLoadType, PassRe fPtr<FormState>,
230 const SubstituteData&, ClientRedirectPolicy = NotClientRedirect, const A tomicString& overrideEncoding = nullAtom); 228 const SubstituteData&, ClientRedirectPolicy = NotClientRedirect, const A tomicString& overrideEncoding = nullAtom);
231 229
232 void detachFromParent(); 230 void detachFromParent();
233 void detachChildren(); 231 void detachChildren();
234 void closeAndRemoveChild(Frame*); 232 void closeAndRemoveChild(Frame*);
235 void detachClient(); 233 void detachClient();
236 234
237 enum HistoryItemPolicy { 235 enum HistoryItemPolicy {
238 CreateNewHistoryItem, 236 CreateNewHistoryItem,
239 DoNotCreateNewHistoryItem 237 DoNotCreateNewHistoryItem
240 }; 238 };
241 void setHistoryItemStateForCommit(HistoryItemPolicy, bool isPushOrReplaceSta te = false, PassRefPtr<SerializedScriptValue> = 0); 239 void setHistoryItemStateForCommit(HistoryItemPolicy, bool isPushOrReplaceSta te = false, PassRefPtr<SerializedScriptValue> = 0);
242 240
243 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, bool isNewNavigation, ClientRedirectPolicy); 241 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, UpdateBackForwardListPolicy, ClientRedirectPolicy);
244 242
245 void scheduleCheckCompleted(); 243 void scheduleCheckCompleted();
246 void startCheckCompleteTimer(); 244 void startCheckCompleteTimer();
247 245
248 Frame* m_frame; 246 Frame* m_frame;
249 FrameLoaderClient* m_client; 247 FrameLoaderClient* m_client;
250 248
251 // FIXME: These should be OwnPtr<T> to reduce build times and simplify 249 // FIXME: These should be OwnPtr<T> to reduce build times and simplify
252 // header dependencies unless performance testing proves otherwise. 250 // header dependencies unless performance testing proves otherwise.
253 // Some of these could be lazily created for memory savings on devices. 251 // Some of these could be lazily created for memory savings on devices.
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 283
286 bool m_didAccessInitialDocument; 284 bool m_didAccessInitialDocument;
287 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 285 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
288 286
289 SandboxFlags m_forcedSandboxFlags; 287 SandboxFlags m_forcedSandboxFlags;
290 }; 288 };
291 289
292 } // namespace WebCore 290 } // namespace WebCore
293 291
294 #endif // FrameLoader_h 292 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « Source/core/loader/DocumentLoader.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698