Chromium Code Reviews| Index: Source/web/WebRemoteFrameImpl.cpp |
| diff --git a/Source/web/WebRemoteFrameImpl.cpp b/Source/web/WebRemoteFrameImpl.cpp |
| index 44df7f6352532d7327994f6f497da6b3419dbdb0..6fffc70ffff04b3a4d7c57900b155f90cdf3d982 100644 |
| --- a/Source/web/WebRemoteFrameImpl.cpp |
| +++ b/Source/web/WebRemoteFrameImpl.cpp |
| @@ -7,8 +7,12 @@ |
| #include "core/frame/FrameOwner.h" |
| #include "core/frame/RemoteFrame.h" |
| +#include "core/html/HTMLFrameOwnerElement.h" |
| #include "core/page/Page.h" |
| +#include "core/rendering/RenderLayer.h" |
| +#include "core/rendering/RenderPart.h" |
| #include "public/platform/WebFloatRect.h" |
| +#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.
|
| #include "public/platform/WebRect.h" |
| #include "public/web/WebDocument.h" |
| #include "public/web/WebPerformance.h" |
| @@ -161,12 +165,12 @@ void WebRemoteFrameImpl::setIsRemote(bool) |
| ASSERT_NOT_REACHED(); |
| } |
| -void WebRemoteFrameImpl::setRemoteWebLayer(WebLayer* layer) |
| +void WebRemoteFrameImpl::setRemoteWebLayer(WebLayer* webLayer) |
| { |
| if (!frame()) |
| return; |
| - frame()->setRemotePlatformLayer(layer); |
| + frame()->setRemotePlatformLayer(webLayer); |
| } |
| void WebRemoteFrameImpl::setPermissionClient(WebPermissionClient*) |
| @@ -239,8 +243,9 @@ bool WebRemoteFrameImpl::hasVerticalScrollbar() const |
| WebView* WebRemoteFrameImpl::view() const |
| { |
| - ASSERT_NOT_REACHED(); |
| - return 0; |
| + if (!frame()) |
| + return 0; |
| + return WebViewImpl::fromPage(frame()->page()); |
| } |
| void WebRemoteFrameImpl::removeChild(WebFrame* frame) |
| @@ -251,7 +256,6 @@ void WebRemoteFrameImpl::removeChild(WebFrame* frame) |
| WebDocument WebRemoteFrameImpl::document() const |
| { |
| - ASSERT_NOT_REACHED(); |
| return WebDocument(); |
| } |
| @@ -510,12 +514,10 @@ bool WebRemoteFrameImpl::isCommandEnabled(const WebString&) const |
| void WebRemoteFrameImpl::enableContinuousSpellChecking(bool) |
| { |
| - ASSERT_NOT_REACHED(); |
| } |
| bool WebRemoteFrameImpl::isContinuousSpellCheckingEnabled() const |
| { |
| - 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
|
| return false; |
| } |