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

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

Issue 551973005: Streamline frame detach (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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
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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 void dispatchDocumentElementAvailable(); 148 void dispatchDocumentElementAvailable();
149 149
150 // The following sandbox flags will be forced, regardless of changes to 150 // The following sandbox flags will be forced, regardless of changes to
151 // the sandbox attribute of any parent frames. 151 // the sandbox attribute of any parent frames.
152 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; } 152 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; }
153 SandboxFlags effectiveSandboxFlags() const; 153 SandboxFlags effectiveSandboxFlags() const;
154 154
155 Frame* opener(); 155 Frame* opener();
156 void setOpener(LocalFrame*); 156 void setOpener(LocalFrame*);
157 157
158 void detachFromParent(); 158 void detach();
159 159
160 void loadDone(); 160 void loadDone();
161 void finishedParsing(); 161 void finishedParsing();
162 void checkCompleted(); 162 void checkCompleted();
163 163
164 void commitProvisionalLoad(); 164 void commitProvisionalLoad();
165 165
166 FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; } 166 FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; }
167 167
168 LocalFrame* findFrameForNavigation(const AtomicString& name, Document* activ eDocument); 168 LocalFrame* findFrameForNavigation(const AtomicString& name, Document* activ eDocument);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 void scrollToFragmentWithParentBoundary(const KURL&); 204 void scrollToFragmentWithParentBoundary(const KURL&);
205 205
206 bool checkLoadCompleteForThisFrame(); 206 bool checkLoadCompleteForThisFrame();
207 207
208 // Calls continueLoadAfterNavigationPolicy 208 // Calls continueLoadAfterNavigationPolicy
209 void loadWithNavigationAction(const NavigationAction&, FrameLoadType, PassRe fPtrWillBeRawPtr<FormState>, 209 void loadWithNavigationAction(const NavigationAction&, FrameLoadType, PassRe fPtrWillBeRawPtr<FormState>,
210 const SubstituteData&, ContentSecurityPolicyCheck shouldCheckMainWorldCo ntentSecurityPolicy, ClientRedirectPolicy = NotClientRedirect, const AtomicStrin g& overrideEncoding = nullAtom); 210 const SubstituteData&, ContentSecurityPolicyCheck shouldCheckMainWorldCo ntentSecurityPolicy, ClientRedirectPolicy = NotClientRedirect, const AtomicStrin g& overrideEncoding = nullAtom);
211 211
212 bool validateTransitionNavigationMode(); 212 bool validateTransitionNavigationMode();
213 bool dispatchNavigationTransitionData(); 213 bool dispatchNavigationTransitionData();
214 void detachClient();
215 214
216 void setHistoryItemStateForCommit(HistoryCommitType, bool isPushOrReplaceSta te = false, PassRefPtr<SerializedScriptValue> = nullptr); 215 void setHistoryItemStateForCommit(HistoryCommitType, bool isPushOrReplaceSta te = false, PassRefPtr<SerializedScriptValue> = nullptr);
217 216
218 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, FrameLoadType, ClientRedirectPolicy); 217 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, FrameLoadType, ClientRedirectPolicy);
219 218
220 void scheduleCheckCompleted(); 219 void scheduleCheckCompleted();
221 220
222 LocalFrame* m_frame; 221 LocalFrame* m_frame;
223 222
224 // FIXME: These should be OwnPtr<T> to reduce build times and simplify 223 // FIXME: These should be OwnPtr<T> to reduce build times and simplify
(...skipping 41 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

Powered by Google App Engine
This is Rietveld 408576698