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

cc/trees/layer_tree_impl.h

 // 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.
 
 #ifndef CC_TREES_LAYER_TREE_IMPL_H_
 #define CC_TREES_LAYER_TREE_IMPL_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 179 matching lines @@
   }
   float min_page_scale_factor() const { return min_page_scale_factor_; }
   float max_page_scale_factor() const { return max_page_scale_factor_; }
 
   float page_scale_delta() const { return page_scale_factor()->Delta(); }
 
   SyncedProperty<ScaleGroup>* page_scale_factor();
   const SyncedProperty<ScaleGroup>* page_scale_factor() const;
 
   void SetDeviceScaleFactor(float device_scale_factor);
+  void SetPaintedDeviceScaleFactor(float painted_device_scale_factor);

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

nit: normally keep the set/get pair together for each var

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

Done.

   float device_scale_factor() const { return device_scale_factor_; }
+  float painted_device_scale_factor() const {
+    return painted_device_scale_factor_;
+  }
 
   SyncedElasticOverscroll* elastic_overscroll() {
     return elastic_overscroll_.get();
   }
   const SyncedElasticOverscroll* elastic_overscroll() const {
     return elastic_overscroll_.get();
   }
 
   SyncedTopControls* top_controls_shown_ratio() {
     return top_controls_shown_ratio_.get();
@@ skipping 220 matching lines @@
   int inner_viewport_scroll_layer_id_;
   int outer_viewport_scroll_layer_id_;
 
   LayerSelection selection_;
 
   scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor_;
   float min_page_scale_factor_;
   float max_page_scale_factor_;
 
   float device_scale_factor_;
+  float painted_device_scale_factor_;
 
   scoped_refptr<SyncedElasticOverscroll> elastic_overscroll_;
 
   typedef base::hash_map<int, LayerImpl*> LayerIdMap;
   LayerIdMap layer_id_map_;
 
   // Maps from clip layer ids to scroll layer ids.  Note that this only includes
   // the subset of clip layers that act as scrolling containers.  (This is
   // derived from LayerImpl::scroll_clip_layer_ and exists to avoid O(n) walks.)
   base::hash_map<int, int> clip_scroll_map_;
@@ skipping 43 matching lines @@
 
   scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_IMPL_H_