Fix UpdateTilePriorities viewport in Android WebView.

cc/debug/overdraw_metrics.cc

 // Copyright 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 "cc/debug/overdraw_metrics.h"
 
 #include "base/debug/trace_event.h"
 #include "base/metrics/histogram.h"
 #include "cc/base/math_util.h"
 #include "cc/trees/layer_tree_host.h"
@@ skipping 129 matching lines @@
 }
 
 void OverdrawMetrics::RecordMetrics(
     const LayerTreeHostImpl* layer_tree_host_impl) const {
   if (record_metrics_for_frame_) {
     RecordMetricsInternal<LayerTreeHostImpl>(DrawingToScreen,
                                              layer_tree_host_impl);
   }
 }
 
-static gfx::Size DeviceViewportSize(const LayerTreeHost* host) {
+static gfx::Size DrawViewportSize(const LayerTreeHost* host) {
   return host->device_viewport_size();
 }
-static gfx::Size DeviceViewportSize(const LayerTreeHostImpl* host_impl) {
-  return host_impl->device_viewport_size();
+static gfx::Size DrawViewportSize(const LayerTreeHostImpl* host_impl) {
+  return host_impl->DrawViewportSize();
 }
 
 template <typename LayerTreeHostType>
 void OverdrawMetrics::RecordMetricsInternal(
     MetricsType metrics_type,
     const LayerTreeHostType* layer_tree_host) const {
   // This gives approximately 10x the percentage of pixels to fill the viewport
   // once.
-  float normalization = 1000.f / (DeviceViewportSize(layer_tree_host).width() *
-                                  DeviceViewportSize(layer_tree_host).height());
+  float normalization = 1000.f / (DrawViewportSize(layer_tree_host).width() *
+                                  DrawViewportSize(layer_tree_host).height());
   // This gives approximately 100x the percentage of tiles to fill the viewport
   // once, if all tiles were 256x256.
   float tile_normalization =
-      10000.f / (DeviceViewportSize(layer_tree_host).width() / 256.f *
-                 DeviceViewportSize(layer_tree_host).height() / 256.f);
+      10000.f / (DrawViewportSize(layer_tree_host).width() / 256.f *
+                 DrawViewportSize(layer_tree_host).height() / 256.f);
   // This gives approximately 10x the percentage of bytes to fill the viewport
   // once, assuming 4 bytes per pixel.
   float byte_normalization = normalization / 4;
 
   switch (metrics_type) {
     case DrawingToScreen: {
       UMA_HISTOGRAM_CUSTOM_COUNTS(
           "Renderer4.pixelCountOpaque_Draw",
           static_cast<int>(normalization * pixels_drawn_opaque_),
           100, 1000000, 50);
@@ skipping 79 matching lines @@
                      contents_texture_use_bytes_,
                      "RenderSurfaceTextureBytes",
                      render_surface_texture_use_bytes_);
       }
       break;
     }
   }
 }
 
 }  // namespace cc