| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index 5a3f5482b5de0a05da5085d156f3808abee86461..eb29bd568b3fb024e35883b538246f742c6101b9 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -142,6 +142,7 @@
|
| #include "third_party/WebKit/public/web/WebFormElement.h"
|
| #include "third_party/WebKit/public/web/WebFrame.h"
|
| #include "third_party/WebKit/public/web/WebFrameContentDumper.h"
|
| +#include "third_party/WebKit/public/web/WebFrameWidget.h"
|
| #include "third_party/WebKit/public/web/WebHistoryItem.h"
|
| #include "third_party/WebKit/public/web/WebHitTestResult.h"
|
| #include "third_party/WebKit/public/web/WebInputElement.h"
|
| @@ -1762,7 +1763,7 @@ void RenderViewImpl::FrameDidStopLoading(WebFrame* frame) {
|
| }
|
| }
|
|
|
| -void RenderViewImpl::AttachWebFrameWidget(blink::WebWidget* frame_widget) {
|
| +void RenderViewImpl::AttachWebFrameWidget(blink::WebFrameWidget* frame_widget) {
|
| // The previous WebFrameWidget must already be detached by CloseForFrame().
|
| DCHECK(!frame_widget_);
|
| frame_widget_ = frame_widget;
|
| @@ -2280,6 +2281,10 @@ blink::WebView* RenderViewImpl::GetWebView() {
|
| return webview();
|
| }
|
|
|
| +blink::WebFrameWidget* RenderViewImpl::GetWebFrameWidget() {
|
| + return frame_widget_;
|
| +}
|
| +
|
| bool RenderViewImpl::ShouldDisplayScrollbars(int width, int height) const {
|
| return (!send_preferred_size_changes_ ||
|
| (disable_scrollbars_size_limit_.width() <= width ||
|
| @@ -2767,8 +2772,8 @@ void RenderViewImpl::OnClearFocusedElement() {
|
| }
|
|
|
| void RenderViewImpl::OnSetBackgroundOpaque(bool opaque) {
|
| - if (webview())
|
| - webview()->setIsTransparent(!opaque);
|
| + if (frame_widget_)
|
| + frame_widget_->setIsTransparent(!opaque);
|
| if (compositor_)
|
| compositor_->setHasTransparentBackground(!opaque);
|
| }
|
|
|