OLD | NEW |
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 "web/WebRemoteFrameImpl.h" | 5 #include "web/WebRemoteFrameImpl.h" |
6 | 6 |
7 #include "core/dom/Fullscreen.h" | 7 #include "core/dom/Fullscreen.h" |
8 #include "core/dom/RemoteSecurityContext.h" | 8 #include "core/dom/RemoteSecurityContext.h" |
9 #include "core/dom/SecurityContext.h" | 9 #include "core/dom/SecurityContext.h" |
10 #include "core/frame/FrameView.h" | 10 #include "core/frame/FrameView.h" |
(...skipping 29 matching lines...) Expand all Loading... |
40 WebRemoteFrameImpl* frame = new WebRemoteFrameImpl(scope, client); | 40 WebRemoteFrameImpl* frame = new WebRemoteFrameImpl(scope, client); |
41 frame->setOpener(opener); | 41 frame->setOpener(opener); |
42 return frame; | 42 return frame; |
43 } | 43 } |
44 | 44 |
45 WebRemoteFrameImpl::~WebRemoteFrameImpl() {} | 45 WebRemoteFrameImpl::~WebRemoteFrameImpl() {} |
46 | 46 |
47 DEFINE_TRACE(WebRemoteFrameImpl) { | 47 DEFINE_TRACE(WebRemoteFrameImpl) { |
48 visitor->trace(m_frameClient); | 48 visitor->trace(m_frameClient); |
49 visitor->trace(m_frame); | 49 visitor->trace(m_frame); |
50 visitor->template registerWeakMembers<WebFrame, &WebFrame::clearWeakFrames>( | |
51 this); | |
52 WebFrame::traceFrames(visitor, this); | 50 WebFrame::traceFrames(visitor, this); |
53 WebFrameImplBase::trace(visitor); | 51 WebFrameImplBase::trace(visitor); |
54 } | 52 } |
55 | 53 |
56 bool WebRemoteFrameImpl::isWebLocalFrame() const { | 54 bool WebRemoteFrameImpl::isWebLocalFrame() const { |
57 return false; | 55 return false; |
58 } | 56 } |
59 | 57 |
60 WebLocalFrame* WebRemoteFrameImpl::toWebLocalFrame() { | 58 WebLocalFrame* WebRemoteFrameImpl::toWebLocalFrame() { |
61 NOTREACHED(); | 59 NOTREACHED(); |
62 return nullptr; | 60 return nullptr; |
63 } | 61 } |
64 | 62 |
65 bool WebRemoteFrameImpl::isWebRemoteFrame() const { | 63 bool WebRemoteFrameImpl::isWebRemoteFrame() const { |
66 return true; | 64 return true; |
67 } | 65 } |
68 | 66 |
69 WebRemoteFrame* WebRemoteFrameImpl::toWebRemoteFrame() { | 67 WebRemoteFrame* WebRemoteFrameImpl::toWebRemoteFrame() { |
70 return this; | 68 return this; |
71 } | 69 } |
72 | 70 |
73 void WebRemoteFrameImpl::close() { | 71 void WebRemoteFrameImpl::close() { |
| 72 WebRemoteFrame::close(); |
| 73 |
74 m_selfKeepAlive.clear(); | 74 m_selfKeepAlive.clear(); |
75 } | 75 } |
76 | 76 |
77 WebString WebRemoteFrameImpl::uniqueName() const { | 77 WebString WebRemoteFrameImpl::uniqueName() const { |
78 NOTREACHED(); | 78 NOTREACHED(); |
79 return WebString(); | 79 return WebString(); |
80 } | 80 } |
81 | 81 |
82 WebString WebRemoteFrameImpl::assignedName() const { | 82 WebString WebRemoteFrameImpl::assignedName() const { |
83 NOTREACHED(); | 83 NOTREACHED(); |
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
531 } | 531 } |
532 | 532 |
533 WebRemoteFrameImpl::WebRemoteFrameImpl(WebTreeScopeType scope, | 533 WebRemoteFrameImpl::WebRemoteFrameImpl(WebTreeScopeType scope, |
534 WebRemoteFrameClient* client) | 534 WebRemoteFrameClient* client) |
535 : WebRemoteFrame(scope), | 535 : WebRemoteFrame(scope), |
536 m_frameClient(RemoteFrameClientImpl::create(this)), | 536 m_frameClient(RemoteFrameClientImpl::create(this)), |
537 m_client(client), | 537 m_client(client), |
538 m_selfKeepAlive(this) {} | 538 m_selfKeepAlive(this) {} |
539 | 539 |
540 } // namespace blink | 540 } // namespace blink |
OLD | NEW |