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

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

Issue 1177333002: Revert of Detach old frame on WebFrame::swap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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
« 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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 SecurityContext::InsecureNavigationsSet* insecureNavigationsToUpgrade() cons t; 149 SecurityContext::InsecureNavigationsSet* insecureNavigationsToUpgrade() cons t;
150 150
151 Frame* opener(); 151 Frame* opener();
152 void setOpener(LocalFrame*); 152 void setOpener(LocalFrame*);
153 153
154 void detach(); 154 void detach();
155 155
156 void finishedParsing(); 156 void finishedParsing();
157 void checkCompleted(); 157 void checkCompleted();
158 158
159 // This prepares the FrameLoader for the next commit. It will dispatch
160 // unload events, abort XHR requests and detach the document. Returns true
161 // if the frame is ready to receive the next commit, or false otherwise.
162 bool prepareForCommit();
163
164 void commitProvisionalLoad(); 159 void commitProvisionalLoad();
165 160
166 FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; } 161 FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; }
167 162
168 void applyUserAgent(ResourceRequest&); 163 void applyUserAgent(ResourceRequest&);
169 164
170 bool shouldInterruptLoadForXFrameOptions(const String&, const KURL&, unsigne d long requestIdentifier); 165 bool shouldInterruptLoadForXFrameOptions(const String&, const KURL&, unsigne d long requestIdentifier);
171 166
172 bool allAncestorsAreComplete() const; // including this 167 bool allAncestorsAreComplete() const; // including this
173 168
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 266 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
272 267
273 SandboxFlags m_forcedSandboxFlags; 268 SandboxFlags m_forcedSandboxFlags;
274 269
275 bool m_dispatchingDidClearWindowObjectInMainWorld; 270 bool m_dispatchingDidClearWindowObjectInMainWorld;
276 }; 271 };
277 272
278 } // namespace blink 273 } // namespace blink
279 274
280 #endif // FrameLoader_h 275 #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