| Index: android_webview/renderer/aw_render_view_ext.cc
|
| diff --git a/android_webview/renderer/aw_render_view_ext.cc b/android_webview/renderer/aw_render_view_ext.cc
|
| index 6a6164ea9e983ba9792e6843134a51e44369ce7b..35cd19056a0bfadfc186d0f4709eadbb87739192 100644
|
| --- a/android_webview/renderer/aw_render_view_ext.cc
|
| +++ b/android_webview/renderer/aw_render_view_ext.cc
|
| @@ -146,7 +146,7 @@ void PopulateHitTestData(const GURL& absolute_link_url,
|
| } // namespace
|
|
|
| AwRenderViewExt::AwRenderViewExt(content::RenderView* render_view)
|
| - : content::RenderViewObserver(render_view), page_scale_factor_(0.0f) {
|
| + : content::RenderViewObserver(render_view) {
|
| }
|
|
|
| AwRenderViewExt::~AwRenderViewExt() {
|
| @@ -188,33 +188,27 @@ void AwRenderViewExt::OnDocumentHasImagesRequest(int id) {
|
| }
|
|
|
| void AwRenderViewExt::DidCommitCompositorFrame() {
|
| - PostCheckContentsSizeAndScale();
|
| + PostCheckContentsSize();
|
| }
|
|
|
| void AwRenderViewExt::DidUpdateLayout() {
|
| - PostCheckContentsSizeAndScale();
|
| + PostCheckContentsSize();
|
| }
|
|
|
| -void AwRenderViewExt::PostCheckContentsSizeAndScale() {
|
| +void AwRenderViewExt::PostCheckContentsSize() {
|
| if (check_contents_size_timer_.IsRunning())
|
| return;
|
|
|
| check_contents_size_timer_.Start(FROM_HERE,
|
| base::TimeDelta::FromMilliseconds(0), this,
|
| - &AwRenderViewExt::CheckContentsSizeAndScale);
|
| + &AwRenderViewExt::CheckContentsSize);
|
| }
|
|
|
| -void AwRenderViewExt::CheckContentsSizeAndScale() {
|
| +void AwRenderViewExt::CheckContentsSize() {
|
| blink::WebView* webview = render_view()->GetWebView();
|
| if (!webview)
|
| return;
|
|
|
| - if (page_scale_factor_ != webview->pageScaleFactor()) {
|
| - page_scale_factor_ = webview->pageScaleFactor();
|
| - Send(new AwViewHostMsg_PageScaleFactorChanged(routing_id(),
|
| - page_scale_factor_));
|
| - }
|
| -
|
| gfx::Size contents_size;
|
|
|
| blink::WebFrame* main_frame = webview->mainFrame();
|
|
|