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

Side by Side Diff: Source/web/WebRemoteFrameImpl.cpp

Issue 1128403004: Fix Frame::isMainFrame() to be compatible with provisional frames (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update stuff Created 5 years, 7 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/frame/Frame.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "web/WebRemoteFrameImpl.h" 6 #include "web/WebRemoteFrameImpl.h"
7 7
8 #include "core/frame/FrameView.h" 8 #include "core/frame/FrameView.h"
9 #include "core/frame/RemoteFrame.h" 9 #include "core/frame/RemoteFrame.h"
10 #include "core/frame/Settings.h" 10 #include "core/frame/Settings.h"
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 } 186 }
187 187
188 void WebRemoteFrameImpl::removeChild(WebFrame* frame) 188 void WebRemoteFrameImpl::removeChild(WebFrame* frame)
189 { 189 {
190 WebFrame::removeChild(frame); 190 WebFrame::removeChild(frame);
191 m_ownersForChildren.remove(frame); 191 m_ownersForChildren.remove(frame);
192 } 192 }
193 193
194 WebDocument WebRemoteFrameImpl::document() const 194 WebDocument WebRemoteFrameImpl::document() const
195 { 195 {
196 // TODO(dcheng): this should also ASSERT_NOT_REACHED, but a lot of
197 // code tries to access the document of a remote frame at the moment.
196 return WebDocument(); 198 return WebDocument();
197 } 199 }
198 200
199 WebPerformance WebRemoteFrameImpl::performance() const 201 WebPerformance WebRemoteFrameImpl::performance() const
200 { 202 {
201 ASSERT_NOT_REACHED(); 203 ASSERT_NOT_REACHED();
202 return WebPerformance(); 204 return WebPerformance();
203 } 205 }
204 206
205 bool WebRemoteFrameImpl::dispatchBeforeUnloadEvent() 207 bool WebRemoteFrameImpl::dispatchBeforeUnloadEvent()
(...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 { 810 {
809 frame()->setIsLoading(false); 811 frame()->setIsLoading(false);
810 if (parent() && parent()->isWebLocalFrame()) { 812 if (parent() && parent()->isWebLocalFrame()) {
811 WebLocalFrameImpl* parentFrame = 813 WebLocalFrameImpl* parentFrame =
812 toWebLocalFrameImpl(parent()->toWebLocalFrame()); 814 toWebLocalFrameImpl(parent()->toWebLocalFrame());
813 parentFrame->frame()->loader().checkCompleted(); 815 parentFrame->frame()->loader().checkCompleted();
814 } 816 }
815 } 817 }
816 818
817 } // namespace blink 819 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/Frame.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698