Propagate pageScaleFactor to GuestViews

android_webview/renderer/aw_render_view_ext.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/renderer/aw_render_view_ext.h"
 
 #include <string>
 
 #include "android_webview/common/aw_hit_test_data.h"
 #include "android_webview/common/render_view_messages.h"
@@ skipping 128 matching lines @@
     data->extra_data_for_type = data->img_src.possibly_invalid_spec();
   } else if (is_editable) {
     data->type = AwHitTestData::EDIT_TEXT_TYPE;
     DCHECK_EQ(0u, data->extra_data_for_type.length());
   }
 }
 
 }  // namespace
 
 AwRenderViewExt::AwRenderViewExt(content::RenderView* render_view)
-    : content::RenderViewObserver(render_view), page_scale_factor_(0.0f) {
+    : content::RenderViewObserver(render_view) {
 }
 
 AwRenderViewExt::~AwRenderViewExt() {
 }
 
 // static
 void AwRenderViewExt::RenderViewCreated(content::RenderView* render_view) {
   new AwRenderViewExt(render_view);  // |render_view| takes ownership.
 }
 
@@ skipping 21 matching lines @@
       blink::WebDocument document = webview->mainFrame()->document();
       const blink::WebElement child_img = GetImgChild(document);
       hasImages = !child_img.isNull();
     }
   }
   Send(new AwViewHostMsg_DocumentHasImagesResponse(routing_id(), id,
                                                    hasImages));
 }
 
 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();
   if (main_frame)
     contents_size = main_frame->contentsSize();
 
   // Fall back to contentsPreferredMinimumSize if the mainFrame is reporting a
   // 0x0 size (this happens during initial load).
   if (contents_size.IsEmpty()) {
     contents_size = webview->contentsPreferredMinimumSize();
@@ skipping 98 matching lines @@
 void AwRenderViewExt::OnSmoothScroll(int target_x,
                                      int target_y,
                                      long duration_ms) {
   if (!render_view() || !render_view()->GetWebView())
     return;
 
   render_view()->GetWebView()->smoothScroll(target_x, target_y, duration_ms);
 }
 
 }  // namespace android_webview