| 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 "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 731 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 742 appendChild(child); | 742 appendChild(child); |
| 743 child->initializeCoreFrame(frame()->host(), result.storedValue->value.get(),
name); | 743 child->initializeCoreFrame(frame()->host(), result.storedValue->value.get(),
name); |
| 744 return child; | 744 return child; |
| 745 } | 745 } |
| 746 | 746 |
| 747 void WebRemoteFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<RemoteFrame> frame) | 747 void WebRemoteFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<RemoteFrame> frame) |
| 748 { | 748 { |
| 749 m_frame = frame; | 749 m_frame = frame; |
| 750 } | 750 } |
| 751 | 751 |
| 752 RemoteFrame* WebRemoteFrameImpl::frame() const |
| 753 { |
| 754 return m_frame.get(); |
| 755 } |
| 756 |
| 752 WebRemoteFrameImpl* WebRemoteFrameImpl::fromFrame(RemoteFrame& frame) | 757 WebRemoteFrameImpl* WebRemoteFrameImpl::fromFrame(RemoteFrame& frame) |
| 753 { | 758 { |
| 754 if (!frame.client()) | 759 if (!frame.client()) |
| 755 return nullptr; | 760 return nullptr; |
| 756 return static_cast<RemoteFrameClientImpl*>(frame.client())->webFrame(); | 761 return static_cast<RemoteFrameClientImpl*>(frame.client())->webFrame(); |
| 757 } | 762 } |
| 758 | 763 |
| 759 void WebRemoteFrameImpl::initializeFromFrame(WebLocalFrame* source) const | 764 void WebRemoteFrameImpl::initializeFromFrame(WebLocalFrame* source) const |
| 760 { | 765 { |
| 761 ASSERT(source); | 766 ASSERT(source); |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 809 : WebRemoteFrame(scope) | 814 : WebRemoteFrame(scope) |
| 810 , m_frameClient(RemoteFrameClientImpl::create(this)) | 815 , m_frameClient(RemoteFrameClientImpl::create(this)) |
| 811 , m_client(client) | 816 , m_client(client) |
| 812 #if ENABLE(OILPAN) | 817 #if ENABLE(OILPAN) |
| 813 , m_selfKeepAlive(this) | 818 , m_selfKeepAlive(this) |
| 814 #endif | 819 #endif |
| 815 { | 820 { |
| 816 } | 821 } |
| 817 | 822 |
| 818 } // namespace blink | 823 } // namespace blink |
| OLD | NEW |