cc: Remove separate x/y raster scales.

cc/tiles/picture_layer_tiling_set.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_TILES_PICTURE_LAYER_TILING_SET_H_
 #define CC_TILES_PICTURE_LAYER_TILING_SET_H_
 
 #include <stddef.h>
 
 #include <list>
@@ skipping 45 matching lines @@
                       float max_acceptable_high_res_scale_key,
                       const std::vector<PictureLayerTiling*>& needed_tilings,
                       PictureLayerTilingSet* twin_set);
   void RemoveNonIdealTilings();
 
   // This function is called on the active tree during activation.
   void UpdateTilingsToCurrentRasterSourceForActivation(
       scoped_refptr<RasterSource> raster_source,
       const PictureLayerTilingSet* pending_twin_set,
       const Region& layer_invalidation,
-      float minimum_contents_scale_key,
-      float maximum_contents_scale_key);
+      float minimum_contents_scale,
+      float maximum_contents_scale);
 
   // This function is called on the sync tree during commit.
   void UpdateTilingsToCurrentRasterSourceForCommit(
       scoped_refptr<RasterSource> raster_source,
       const Region& layer_invalidation,
-      float minimum_contents_scale_key,
-      float maximum_contents_scale_key);
+      float minimum_contents_scale,
+      float maximum_contents_scale);
 
   // This function is called on the sync tree right after commit.
   void UpdateRasterSourceDueToLCDChange(
       scoped_refptr<RasterSource> raster_source,
       const Region& layer_invalidation);
 
-  PictureLayerTiling* AddTiling(float contents_scale_key,
+  PictureLayerTiling* AddTiling(float contents_scale,
                                 scoped_refptr<RasterSource> raster_source);
   size_t num_tilings() const { return tilings_.size(); }
   int NumHighResTilings() const;
   PictureLayerTiling* tiling_at(size_t idx) { return tilings_[idx].get(); }
   const PictureLayerTiling* tiling_at(size_t idx) const {
     return tilings_[idx].get();
   }
   WhichTree tree() const { return tree_; }
 
   PictureLayerTiling* FindTilingWithScaleKey(float scale_key) const;
@@ skipping 26 matching lines @@
   void RemoveAllTiles();
 
   // Update the rects and priorities for tiles based on the given information.
   // Returns true if PrepareTiles is required.
   bool UpdateTilePriorities(const gfx::Rect& required_rect_in_layer_space,
                             float ideal_contents_scale,
                             double current_frame_time_in_seconds,
                             const Occlusion& occlusion_in_layer_space,
                             bool can_require_tiles_for_activation);
 
-  void SetAspectRatio(float ratio);
-  float aspect_ratio() const { return aspect_ratio_; }
-
   void GetAllPrioritizedTilesForTracing(
       std::vector<PrioritizedTile>* prioritized_tiles) const;
 
   // For a given rect, iterates through tiles that can fill it.  If no
   // set of tiles with resources can fill the rect, then it will iterate
   // through null tiles with valid geometry_rect() until the rect is full.
   // If all tiles have resources, the union of all geometry_rects will
   // exactly fill rect with no overlap.
   class CC_EXPORT CoverageIterator {
    public:
@@ skipping 114 matching lines @@
   std::list<FrameVisibleRect> visible_rect_history_;
   StateSinceLastTilePriorityUpdate state_since_last_tile_priority_update_;
 
   scoped_refptr<RasterSource> raster_source_;
 
   gfx::Rect visible_rect_in_layer_space_;
   gfx::Rect skewport_in_layer_space_;
   gfx::Rect soon_border_rect_in_layer_space_;
   gfx::Rect eventually_rect_in_layer_space_;
 
-  float aspect_ratio_ = 1.f;
-
   friend class Iterator;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PictureLayerTilingSet);
 };
 
 }  // namespace cc
 
 #endif  // CC_TILES_PICTURE_LAYER_TILING_SET_H_