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

Side by Side Diff: Source/core/html/HTMLFrameOwnerElement.cpp

Issue 32793003: Have Frame::navigationScheduler() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 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/html/HTMLFormElement.cpp ('k') | Source/core/html/parser/HTMLDocumentParser.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, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 return toSVGDocument(doc); 120 return toSVGDocument(doc);
121 // Spec: http://www.w3.org/TR/SVG/struct.html#InterfaceGetSVGDocument 121 // Spec: http://www.w3.org/TR/SVG/struct.html#InterfaceGetSVGDocument
122 es.throwUninformativeAndGenericDOMException(NotSupportedError); 122 es.throwUninformativeAndGenericDOMException(NotSupportedError);
123 return 0; 123 return 0;
124 } 124 }
125 125
126 bool HTMLFrameOwnerElement::loadOrRedirectSubframe(const KURL& url, const Atomic String& frameName, bool lockBackForwardList) 126 bool HTMLFrameOwnerElement::loadOrRedirectSubframe(const KURL& url, const Atomic String& frameName, bool lockBackForwardList)
127 { 127 {
128 RefPtr<Frame> parentFrame = document().frame(); 128 RefPtr<Frame> parentFrame = document().frame();
129 if (contentFrame()) { 129 if (contentFrame()) {
130 contentFrame()->navigationScheduler()->scheduleLocationChange(document() .securityOrigin(), url.string(), parentFrame->loader()->outgoingReferrer(), lock BackForwardList); 130 contentFrame()->navigationScheduler().scheduleLocationChange(document(). securityOrigin(), url.string(), parentFrame->loader()->outgoingReferrer(), lockB ackForwardList);
131 return true; 131 return true;
132 } 132 }
133 133
134 if (!document().securityOrigin()->canDisplay(url)) { 134 if (!document().securityOrigin()->canDisplay(url)) {
135 FrameLoader::reportLocalLoadFailed(parentFrame.get(), url.string()); 135 FrameLoader::reportLocalLoadFailed(parentFrame.get(), url.string());
136 return false; 136 return false;
137 } 137 }
138 138
139 if (!SubframeLoadingDisabler::canLoadFrame(this)) 139 if (!SubframeLoadingDisabler::canLoadFrame(this))
140 return false; 140 return false;
(...skipping 28 matching lines...) Expand all
169 // FIXME: In this case the Frame will have finished loading before 169 // FIXME: In this case the Frame will have finished loading before
170 // it's being added to the child list. It would be a good idea to 170 // it's being added to the child list. It would be a good idea to
171 // create the child first, then invoke the loader separately. 171 // create the child first, then invoke the loader separately.
172 if (childFrame->loader()->state() == FrameStateComplete && !childFrame->load er()->policyDocumentLoader()) 172 if (childFrame->loader()->state() == FrameStateComplete && !childFrame->load er()->policyDocumentLoader())
173 childFrame->loader()->checkCompleted(); 173 childFrame->loader()->checkCompleted();
174 return true; 174 return true;
175 } 175 }
176 176
177 177
178 } // namespace WebCore 178 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/HTMLFormElement.cpp ('k') | Source/core/html/parser/HTMLDocumentParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698