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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
78 { | 78 { |
79 #if ENABLE(OILPAN) | 79 #if ENABLE(OILPAN) |
80 m_selfKeepAlive.clear(); | 80 m_selfKeepAlive.clear(); |
81 #else | 81 #else |
82 deref(); | 82 deref(); |
83 #endif | 83 #endif |
84 } | 84 } |
85 | 85 |
86 WebString WebRemoteFrameImpl::uniqueName() const | 86 WebString WebRemoteFrameImpl::uniqueName() const |
87 { | 87 { |
88 ASSERT_NOT_REACHED(); | 88 // FIXME: Why aren't these name methods allowed in WebRemoteFrame? |
89 return WebString(); | 89 ASSERT(frame()); |
90 return frame()->tree().uniqueName(); | |
Charlie Reis
2015/11/06 23:04:48
I'm not sure why name and uniqueName aren't allowe
dcheng
2015/11/25 18:14:51
Actually, let's try to limit the API surface of We
Charlie Reis
2015/11/25 18:22:43
Ok, will do.
| |
90 } | 91 } |
91 | 92 |
92 WebString WebRemoteFrameImpl::assignedName() const | 93 WebString WebRemoteFrameImpl::assignedName() const |
93 { | 94 { |
94 ASSERT_NOT_REACHED(); | 95 ASSERT_NOT_REACHED(); |
95 return WebString(); | 96 return WebString(); |
96 } | 97 } |
97 | 98 |
98 void WebRemoteFrameImpl::setName(const WebString&) | 99 void WebRemoteFrameImpl::setName(const WebString&) |
99 { | 100 { |
(...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
809 : WebRemoteFrame(scope) | 810 : WebRemoteFrame(scope) |
810 , m_frameClient(RemoteFrameClientImpl::create(this)) | 811 , m_frameClient(RemoteFrameClientImpl::create(this)) |
811 , m_client(client) | 812 , m_client(client) |
812 #if ENABLE(OILPAN) | 813 #if ENABLE(OILPAN) |
813 , m_selfKeepAlive(this) | 814 , m_selfKeepAlive(this) |
814 #endif | 815 #endif |
815 { | 816 { |
816 } | 817 } |
817 | 818 |
818 } // namespace blink | 819 } // namespace blink |
OLD | NEW |