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/FrameOwner.h" | 8 #include "core/frame/FrameOwner.h" |
9 #include "core/frame/RemoteFrame.h" | 9 #include "core/frame/RemoteFrame.h" |
10 #include "core/html/HTMLFrameOwnerElement.h" | |
10 #include "core/page/Page.h" | 11 #include "core/page/Page.h" |
12 #include "core/rendering/RenderLayer.h" | |
13 #include "core/rendering/RenderPart.h" | |
11 #include "public/platform/WebFloatRect.h" | 14 #include "public/platform/WebFloatRect.h" |
15 #include "public/platform/WebLayer.h" | |
dcheng
2014/07/16 21:09:08
All these includes seem to be unnecessary.
kenrb
2014/07/17 14:57:02
Apparently so. Removed.
| |
12 #include "public/platform/WebRect.h" | 16 #include "public/platform/WebRect.h" |
13 #include "public/web/WebDocument.h" | 17 #include "public/web/WebDocument.h" |
14 #include "public/web/WebPerformance.h" | 18 #include "public/web/WebPerformance.h" |
15 #include "public/web/WebRange.h" | 19 #include "public/web/WebRange.h" |
16 #include "web/WebLocalFrameImpl.h" | 20 #include "web/WebLocalFrameImpl.h" |
17 #include "web/WebViewImpl.h" | 21 #include "web/WebViewImpl.h" |
18 #include <v8/include/v8.h> | 22 #include <v8/include/v8.h> |
19 | 23 |
20 using namespace WebCore; | 24 using namespace WebCore; |
21 | 25 |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
154 { | 158 { |
155 ASSERT_NOT_REACHED(); | 159 ASSERT_NOT_REACHED(); |
156 return WebVector<WebIconURL>(); | 160 return WebVector<WebIconURL>(); |
157 } | 161 } |
158 | 162 |
159 void WebRemoteFrameImpl::setIsRemote(bool) | 163 void WebRemoteFrameImpl::setIsRemote(bool) |
160 { | 164 { |
161 ASSERT_NOT_REACHED(); | 165 ASSERT_NOT_REACHED(); |
162 } | 166 } |
163 | 167 |
164 void WebRemoteFrameImpl::setRemoteWebLayer(WebLayer* layer) | 168 void WebRemoteFrameImpl::setRemoteWebLayer(WebLayer* webLayer) |
165 { | 169 { |
166 if (!frame()) | 170 if (!frame()) |
167 return; | 171 return; |
168 | 172 |
169 frame()->setRemotePlatformLayer(layer); | 173 frame()->setRemotePlatformLayer(webLayer); |
170 } | 174 } |
171 | 175 |
172 void WebRemoteFrameImpl::setPermissionClient(WebPermissionClient*) | 176 void WebRemoteFrameImpl::setPermissionClient(WebPermissionClient*) |
173 { | 177 { |
174 ASSERT_NOT_REACHED(); | 178 ASSERT_NOT_REACHED(); |
175 } | 179 } |
176 | 180 |
177 void WebRemoteFrameImpl::setSharedWorkerRepositoryClient(WebSharedWorkerReposito ryClient*) | 181 void WebRemoteFrameImpl::setSharedWorkerRepositoryClient(WebSharedWorkerReposito ryClient*) |
178 { | 182 { |
179 ASSERT_NOT_REACHED(); | 183 ASSERT_NOT_REACHED(); |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
232 } | 236 } |
233 | 237 |
234 bool WebRemoteFrameImpl::hasVerticalScrollbar() const | 238 bool WebRemoteFrameImpl::hasVerticalScrollbar() const |
235 { | 239 { |
236 ASSERT_NOT_REACHED(); | 240 ASSERT_NOT_REACHED(); |
237 return false; | 241 return false; |
238 } | 242 } |
239 | 243 |
240 WebView* WebRemoteFrameImpl::view() const | 244 WebView* WebRemoteFrameImpl::view() const |
241 { | 245 { |
242 ASSERT_NOT_REACHED(); | 246 if (!frame()) |
243 return 0; | 247 return 0; |
248 return WebViewImpl::fromPage(frame()->page()); | |
244 } | 249 } |
245 | 250 |
246 void WebRemoteFrameImpl::removeChild(WebFrame* frame) | 251 void WebRemoteFrameImpl::removeChild(WebFrame* frame) |
247 { | 252 { |
248 WebFrame::removeChild(frame); | 253 WebFrame::removeChild(frame); |
249 m_ownersForChildren.remove(frame); | 254 m_ownersForChildren.remove(frame); |
250 } | 255 } |
251 | 256 |
252 WebDocument WebRemoteFrameImpl::document() const | 257 WebDocument WebRemoteFrameImpl::document() const |
253 { | 258 { |
254 ASSERT_NOT_REACHED(); | |
255 return WebDocument(); | 259 return WebDocument(); |
256 } | 260 } |
257 | 261 |
258 WebPerformance WebRemoteFrameImpl::performance() const | 262 WebPerformance WebRemoteFrameImpl::performance() const |
259 { | 263 { |
260 ASSERT_NOT_REACHED(); | 264 ASSERT_NOT_REACHED(); |
261 return WebPerformance(); | 265 return WebPerformance(); |
262 } | 266 } |
263 | 267 |
264 bool WebRemoteFrameImpl::dispatchBeforeUnloadEvent() | 268 bool WebRemoteFrameImpl::dispatchBeforeUnloadEvent() |
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
503 } | 507 } |
504 | 508 |
505 bool WebRemoteFrameImpl::isCommandEnabled(const WebString&) const | 509 bool WebRemoteFrameImpl::isCommandEnabled(const WebString&) const |
506 { | 510 { |
507 ASSERT_NOT_REACHED(); | 511 ASSERT_NOT_REACHED(); |
508 return false; | 512 return false; |
509 } | 513 } |
510 | 514 |
511 void WebRemoteFrameImpl::enableContinuousSpellChecking(bool) | 515 void WebRemoteFrameImpl::enableContinuousSpellChecking(bool) |
512 { | 516 { |
513 ASSERT_NOT_REACHED(); | |
514 } | 517 } |
515 | 518 |
516 bool WebRemoteFrameImpl::isContinuousSpellCheckingEnabled() const | 519 bool WebRemoteFrameImpl::isContinuousSpellCheckingEnabled() const |
517 { | 520 { |
518 ASSERT_NOT_REACHED(); | |
dcheng
2014/07/16 21:09:08
We're deleting these because we haven't had time t
kenrb
2014/07/17 14:57:02
Yes, except for WebRemoteFrameImpl::view(), which
| |
519 return false; | 521 return false; |
520 } | 522 } |
521 | 523 |
522 void WebRemoteFrameImpl::requestTextChecking(const WebElement&) | 524 void WebRemoteFrameImpl::requestTextChecking(const WebElement&) |
523 { | 525 { |
524 ASSERT_NOT_REACHED(); | 526 ASSERT_NOT_REACHED(); |
525 } | 527 } |
526 | 528 |
527 void WebRemoteFrameImpl::replaceMisspelledRange(const WebString&) | 529 void WebRemoteFrameImpl::replaceMisspelledRange(const WebString&) |
528 { | 530 { |
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
826 | 828 |
827 WebRemoteFrameImpl* WebRemoteFrameImpl::fromFrame(RemoteFrame& frame) | 829 WebRemoteFrameImpl* WebRemoteFrameImpl::fromFrame(RemoteFrame& frame) |
828 { | 830 { |
829 if (!frame.client()) | 831 if (!frame.client()) |
830 return 0; | 832 return 0; |
831 return static_cast<RemoteFrameClient*>(frame.client())->webFrame(); | 833 return static_cast<RemoteFrameClient*>(frame.client())->webFrame(); |
832 } | 834 } |
833 | 835 |
834 } // namespace blink | 836 } // namespace blink |
835 | 837 |
OLD | NEW |