Introduce painted-device-scale-factor and use it when --enable-use-zoom-for-dsf is specified.

cc/trees/layer_tree_host_impl.cc

 // Copyright 2011 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/trees/layer_tree_host_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <set>
@@ skipping 1489 matching lines @@
 void LayerTreeHostImpl::OnDraw() {
   client_->OnDrawForOutputSurface();
 }
 
 void LayerTreeHostImpl::OnCanDrawStateChangedForTree() {
   client_->OnCanDrawStateChanged(CanDraw());
 }
 
 CompositorFrameMetadata LayerTreeHostImpl::MakeCompositorFrameMetadata() const {
   CompositorFrameMetadata metadata;
-  metadata.device_scale_factor = active_tree_->device_scale_factor();
+  float metadata_device_scale_factor =
+      active_tree_->painted_device_scale_factor() > 0.0f

[danakj, 2015/10/22 23:15:29]

if it defaults to one you dont need an if here. you can just multiply them
together?

[oshima, 2015/10/23 18:05:36]

Done.

+          ? active_tree_->painted_device_scale_factor()
+          : active_tree_->device_scale_factor();
+
+  metadata.device_scale_factor = metadata_device_scale_factor;
   metadata.page_scale_factor = active_tree_->current_page_scale_factor();
   metadata.scrollable_viewport_size = active_tree_->ScrollableViewportSize();
   metadata.root_layer_size = active_tree_->ScrollableSize();
   metadata.min_page_scale_factor = active_tree_->min_page_scale_factor();
   metadata.max_page_scale_factor = active_tree_->max_page_scale_factor();
   metadata.location_bar_offset =
       gfx::Vector2dF(0.f, top_controls_manager_->ControlsTopOffset());
   metadata.location_bar_content_translation =
       gfx::Vector2dF(0.f, top_controls_manager_->ContentTopOffset());
   metadata.root_background_color = active_tree_->background_color();
@@ skipping 2117 matching lines @@
   if (active_tree()) {
     LayerAnimationValueProvider* layer = active_tree()->LayerById(layer_id);
     if (layer)
       return layer->ScrollOffsetForAnimation();
   }
 
   return gfx::ScrollOffset();
 }
 
 }  // namespace cc