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

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

Issue 618253002: Revert of 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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 void dispatchDocumentElementAvailable(); 143 void dispatchDocumentElementAvailable();
144 144
145 // The following sandbox flags will be forced, regardless of changes to 145 // The following sandbox flags will be forced, regardless of changes to
146 // the sandbox attribute of any parent frames. 146 // the sandbox attribute of any parent frames.
147 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; } 147 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; }
148 SandboxFlags effectiveSandboxFlags() const; 148 SandboxFlags effectiveSandboxFlags() const;
149 149
150 Frame* opener(); 150 Frame* opener();
151 void setOpener(LocalFrame*); 151 void setOpener(LocalFrame*);
152 152
153 void detach(); 153 void detachFromParent();
154 154
155 void loadDone(); 155 void loadDone();
156 void finishedParsing(); 156 void finishedParsing();
157 void checkCompleted(); 157 void checkCompleted();
158 158
159 void commitProvisionalLoad(); 159 void commitProvisionalLoad();
160 160
161 FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; } 161 FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; }
162 162
163 LocalFrame* findFrameForNavigation(const AtomicString& name, Document* activ eDocument); 163 LocalFrame* findFrameForNavigation(const AtomicString& name, Document* activ eDocument);
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 void scrollToFragmentWithParentBoundary(const KURL&); 201 void scrollToFragmentWithParentBoundary(const KURL&);
202 202
203 bool checkLoadCompleteForThisFrame(); 203 bool checkLoadCompleteForThisFrame();
204 204
205 // Calls continueLoadAfterNavigationPolicy 205 // Calls continueLoadAfterNavigationPolicy
206 void loadWithNavigationAction(const NavigationAction&, FrameLoadType, PassRe fPtrWillBeRawPtr<FormState>, 206 void loadWithNavigationAction(const NavigationAction&, FrameLoadType, PassRe fPtrWillBeRawPtr<FormState>,
207 const SubstituteData&, ContentSecurityPolicyCheck shouldCheckMainWorldCo ntentSecurityPolicy, ClientRedirectPolicy = NotClientRedirect); 207 const SubstituteData&, ContentSecurityPolicyCheck shouldCheckMainWorldCo ntentSecurityPolicy, ClientRedirectPolicy = NotClientRedirect);
208 208
209 bool validateTransitionNavigationMode(); 209 bool validateTransitionNavigationMode();
210 bool dispatchNavigationTransitionData(); 210 bool dispatchNavigationTransitionData();
211 void detachClient();
211 212
212 void setHistoryItemStateForCommit(HistoryCommitType, bool isPushOrReplaceSta te = false, PassRefPtr<SerializedScriptValue> = nullptr); 213 void setHistoryItemStateForCommit(HistoryCommitType, bool isPushOrReplaceSta te = false, PassRefPtr<SerializedScriptValue> = nullptr);
213 214
214 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, FrameLoadType, ClientRedirectPolicy); 215 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, FrameLoadType, ClientRedirectPolicy);
215 216
216 void scheduleCheckCompleted(); 217 void scheduleCheckCompleted();
217 218
218 RawPtrWillBeMember<LocalFrame> m_frame; 219 RawPtrWillBeMember<LocalFrame> m_frame;
219 220
220 // FIXME: These should be OwnPtr<T> to reduce build times and simplify 221 // FIXME: These should be OwnPtr<T> to reduce build times and simplify
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 264
264 bool m_didAccessInitialDocument; 265 bool m_didAccessInitialDocument;
265 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 266 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
266 267
267 SandboxFlags m_forcedSandboxFlags; 268 SandboxFlags m_forcedSandboxFlags;
268 }; 269 };
269 270
270 } // namespace blink 271 } // namespace blink
271 272
272 #endif // FrameLoader_h 273 #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