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

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

Issue 419863004: Refactor frame detach to work for both local and remote frames. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix comment typo Created 6 years, 4 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/html/HTMLFrameOwnerElement.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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 void dispatchDocumentElementAvailable(); 151 void dispatchDocumentElementAvailable();
152 152
153 // The following sandbox flags will be forced, regardless of changes to 153 // The following sandbox flags will be forced, regardless of changes to
154 // the sandbox attribute of any parent frames. 154 // the sandbox attribute of any parent frames.
155 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; } 155 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; }
156 SandboxFlags effectiveSandboxFlags() const; 156 SandboxFlags effectiveSandboxFlags() const;
157 157
158 LocalFrame* opener(); 158 LocalFrame* opener();
159 void setOpener(LocalFrame*); 159 void setOpener(LocalFrame*);
160 160
161 void frameDetached(); 161 void detachFromParent();
162 162
163 void loadDone(); 163 void loadDone();
164 void finishedParsing(); 164 void finishedParsing();
165 void checkCompleted(); 165 void checkCompleted();
166 166
167 void commitProvisionalLoad(); 167 void commitProvisionalLoad();
168 168
169 FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; } 169 FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; }
170 170
171 LocalFrame* findFrameForNavigation(const AtomicString& name, Document* activ eDocument); 171 LocalFrame* findFrameForNavigation(const AtomicString& name, Document* activ eDocument);
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 void scrollToFragmentWithParentBoundary(const KURL&); 209 void scrollToFragmentWithParentBoundary(const KURL&);
210 210
211 bool checkLoadCompleteForThisFrame(); 211 bool checkLoadCompleteForThisFrame();
212 212
213 // Calls continueLoadAfterNavigationPolicy 213 // Calls continueLoadAfterNavigationPolicy
214 void loadWithNavigationAction(const NavigationAction&, FrameLoadType, PassRe fPtrWillBeRawPtr<FormState>, 214 void loadWithNavigationAction(const NavigationAction&, FrameLoadType, PassRe fPtrWillBeRawPtr<FormState>,
215 const SubstituteData&, ContentSecurityPolicyCheck shouldCheckMainWorldCo ntentSecurityPolicy, ClientRedirectPolicy = NotClientRedirect, const AtomicStrin g& overrideEncoding = nullAtom); 215 const SubstituteData&, ContentSecurityPolicyCheck shouldCheckMainWorldCo ntentSecurityPolicy, ClientRedirectPolicy = NotClientRedirect, const AtomicStrin g& overrideEncoding = nullAtom);
216 216
217 bool validateTransitionNavigationMode(); 217 bool validateTransitionNavigationMode();
218 bool dispatchNavigationTransitionData(); 218 bool dispatchNavigationTransitionData();
219 void detachFromParent();
220 void detachChildren();
221 void detachClient(); 219 void detachClient();
222 220
223 void setHistoryItemStateForCommit(HistoryCommitType, bool isPushOrReplaceSta te = false, PassRefPtr<SerializedScriptValue> = nullptr); 221 void setHistoryItemStateForCommit(HistoryCommitType, bool isPushOrReplaceSta te = false, PassRefPtr<SerializedScriptValue> = nullptr);
224 222
225 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, FrameLoadType, ClientRedirectPolicy); 223 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, FrameLoadType, ClientRedirectPolicy);
226 224
227 void scheduleCheckCompleted(); 225 void scheduleCheckCompleted();
228 void startCheckCompleteTimer(); 226 void startCheckCompleteTimer();
229 227
230 LocalFrame* m_frame; 228 LocalFrame* m_frame;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 279 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
282 280
283 SandboxFlags m_forcedSandboxFlags; 281 SandboxFlags m_forcedSandboxFlags;
284 282
285 bool m_willDetachClient; 283 bool m_willDetachClient;
286 }; 284 };
287 285
288 } // namespace blink 286 } // namespace blink
289 287
290 #endif // FrameLoader_h 288 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « Source/core/html/HTMLFrameOwnerElement.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698