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

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

Issue 645623004: Reland "Streamline frame detach" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/EmptyClients.h ('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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 void dispatchDocumentElementAvailable(); 145 void dispatchDocumentElementAvailable();
146 146
147 // The following sandbox flags will be forced, regardless of changes to 147 // The following sandbox flags will be forced, regardless of changes to
148 // the sandbox attribute of any parent frames. 148 // the sandbox attribute of any parent frames.
149 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; } 149 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; }
150 SandboxFlags effectiveSandboxFlags() const; 150 SandboxFlags effectiveSandboxFlags() const;
151 151
152 Frame* opener(); 152 Frame* opener();
153 void setOpener(LocalFrame*); 153 void setOpener(LocalFrame*);
154 154
155 void detachFromParent(); 155 void detach();
156 156
157 void loadDone(); 157 void loadDone();
158 void finishedParsing(); 158 void finishedParsing();
159 void checkCompleted(); 159 void checkCompleted();
160 160
161 void commitProvisionalLoad(); 161 void commitProvisionalLoad();
162 162
163 FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; } 163 FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; }
164 164
165 LocalFrame* findFrameForNavigation(const AtomicString& name, Document* activ eDocument); 165 LocalFrame* findFrameForNavigation(const AtomicString& name, Document* activ eDocument);
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 void scrollToFragmentWithParentBoundary(const KURL&); 203 void scrollToFragmentWithParentBoundary(const KURL&);
204 204
205 bool checkLoadCompleteForThisFrame(); 205 bool checkLoadCompleteForThisFrame();
206 206
207 // Calls continueLoadAfterNavigationPolicy 207 // Calls continueLoadAfterNavigationPolicy
208 void loadWithNavigationAction(const NavigationAction&, FrameLoadType, PassRe fPtrWillBeRawPtr<FormState>, 208 void loadWithNavigationAction(const NavigationAction&, FrameLoadType, PassRe fPtrWillBeRawPtr<FormState>,
209 const SubstituteData&, ContentSecurityPolicyCheck shouldCheckMainWorldCo ntentSecurityPolicy, ClientRedirectPolicy = NotClientRedirect); 209 const SubstituteData&, ContentSecurityPolicyCheck shouldCheckMainWorldCo ntentSecurityPolicy, ClientRedirectPolicy = NotClientRedirect);
210 210
211 bool validateTransitionNavigationMode(); 211 bool validateTransitionNavigationMode();
212 bool dispatchNavigationTransitionData(); 212 bool dispatchNavigationTransitionData();
213 void detachClient();
214 213
215 void setHistoryItemStateForCommit(HistoryCommitType, bool isPushOrReplaceSta te = false, PassRefPtr<SerializedScriptValue> = nullptr); 214 void setHistoryItemStateForCommit(HistoryCommitType, bool isPushOrReplaceSta te = false, PassRefPtr<SerializedScriptValue> = nullptr);
216 215
217 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, FrameLoadType, ClientRedirectPolicy); 216 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, FrameLoadType, ClientRedirectPolicy);
218 217
219 void scheduleCheckCompleted(); 218 void scheduleCheckCompleted();
220 219
221 RawPtrWillBeMember<LocalFrame> m_frame; 220 RawPtrWillBeMember<LocalFrame> m_frame;
222 221
223 // FIXME: These should be OwnPtr<T> to reduce build times and simplify 222 // FIXME: These should be OwnPtr<T> to reduce build times and simplify
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 265
267 bool m_didAccessInitialDocument; 266 bool m_didAccessInitialDocument;
268 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 267 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
269 268
270 SandboxFlags m_forcedSandboxFlags; 269 SandboxFlags m_forcedSandboxFlags;
271 }; 270 };
272 271
273 } // namespace blink 272 } // namespace blink
274 273
275 #endif // FrameLoader_h 274 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « Source/core/loader/EmptyClients.h ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698