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

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

Issue 544013005: Simplify window.closed testing. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
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
« no previous file with comments | « Source/web/WebLocalFrameImpl.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/FrameOwner.h" 8 #include "core/frame/FrameOwner.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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 return true; 123 return true;
124 } 124 }
125 125
126 WebRemoteFrame* WebRemoteFrameImpl::toWebRemoteFrame() 126 WebRemoteFrame* WebRemoteFrameImpl::toWebRemoteFrame()
127 { 127 {
128 return this; 128 return this;
129 } 129 }
130 130
131 void WebRemoteFrameImpl::close() 131 void WebRemoteFrameImpl::close()
132 { 132 {
133 if (m_frame)
134 m_frame->setHasBeenClosed();
135
136 deref(); 133 deref();
137 } 134 }
138 135
139 WebString WebRemoteFrameImpl::uniqueName() const 136 WebString WebRemoteFrameImpl::uniqueName() const
140 { 137 {
141 ASSERT_NOT_REACHED(); 138 ASSERT_NOT_REACHED();
142 return WebString(); 139 return WebString();
143 } 140 }
144 141
145 WebString WebRemoteFrameImpl::assignedName() const 142 WebString WebRemoteFrameImpl::assignedName() const
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after
831 } 828 }
832 829
833 WebRemoteFrameImpl* WebRemoteFrameImpl::fromFrame(RemoteFrame& frame) 830 WebRemoteFrameImpl* WebRemoteFrameImpl::fromFrame(RemoteFrame& frame)
834 { 831 {
835 if (!frame.client()) 832 if (!frame.client())
836 return 0; 833 return 0;
837 return static_cast<RemoteFrameClient*>(frame.client())->webFrame(); 834 return static_cast<RemoteFrameClient*>(frame.client())->webFrame();
838 } 835 }
839 836
840 } // namespace blink 837 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebLocalFrameImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698