| Index: Source/web/WebRemoteFrameImpl.cpp
|
| diff --git a/Source/web/WebRemoteFrameImpl.cpp b/Source/web/WebRemoteFrameImpl.cpp
|
| index 44df7f6352532d7327994f6f497da6b3419dbdb0..1f285c1c68060bb41cfcf05ff3bea5fea2415346 100644
|
| --- a/Source/web/WebRemoteFrameImpl.cpp
|
| +++ b/Source/web/WebRemoteFrameImpl.cpp
|
| @@ -161,12 +161,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 +239,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 +252,6 @@ void WebRemoteFrameImpl::removeChild(WebFrame* frame)
|
|
|
| WebDocument WebRemoteFrameImpl::document() const
|
| {
|
| - ASSERT_NOT_REACHED();
|
| return WebDocument();
|
| }
|
|
|
| @@ -510,12 +510,10 @@ bool WebRemoteFrameImpl::isCommandEnabled(const WebString&) const
|
|
|
| void WebRemoteFrameImpl::enableContinuousSpellChecking(bool)
|
| {
|
| - ASSERT_NOT_REACHED();
|
| }
|
|
|
| bool WebRemoteFrameImpl::isContinuousSpellCheckingEnabled() const
|
| {
|
| - ASSERT_NOT_REACHED();
|
| return false;
|
| }
|
|
|
|
|