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

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

Issue 1041473002: 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
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 SecurityContext::InsecureNavigationsSet* insecureNavigationsToUpgrade() cons t; 145 SecurityContext::InsecureNavigationsSet* insecureNavigationsToUpgrade() cons t;
146 146
147 Frame* opener(); 147 Frame* opener();
148 void setOpener(LocalFrame*); 148 void setOpener(LocalFrame*);
149 149
150 void detach(); 150 void detach();
151 151
152 void finishedParsing(); 152 void finishedParsing();
153 void checkCompleted(); 153 void checkCompleted();
154 154
155 // This prepares the FrameLoader for the next commit. It will dispatch
156 // unload events, abort XHR requests and detach the document. Returns true
157 // if the frame is ready to receive the next commit, or false otherwise.
158 bool prepareForCommit();
159
155 void commitProvisionalLoad(); 160 void commitProvisionalLoad();
156 161
157 FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; } 162 FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; }
158 163
159 void applyUserAgent(ResourceRequest&); 164 void applyUserAgent(ResourceRequest&);
160 165
161 bool shouldInterruptLoadForXFrameOptions(const String&, const KURL&, unsigne d long requestIdentifier); 166 bool shouldInterruptLoadForXFrameOptions(const String&, const KURL&, unsigne d long requestIdentifier);
162 167
163 bool allAncestorsAreComplete() const; // including this 168 bool allAncestorsAreComplete() const; // including this
164 169
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 263 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
259 264
260 SandboxFlags m_forcedSandboxFlags; 265 SandboxFlags m_forcedSandboxFlags;
261 266
262 bool m_dispatchingDidClearWindowObjectInMainWorld; 267 bool m_dispatchingDidClearWindowObjectInMainWorld;
263 }; 268 };
264 269
265 } // namespace blink 270 } // namespace blink
266 271
267 #endif // FrameLoader_h 272 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698