cc: Remove separate x/y raster scales.

cc/tiles/picture_layer_tiling_set.h

Index: cc/tiles/picture_layer_tiling_set.h
diff --git a/cc/tiles/picture_layer_tiling_set.h b/cc/tiles/picture_layer_tiling_set.h
index 8addadfbd8d232e109bda0bfab8662ea6e39d033..211ae54f3dfa3b199de441a61ed0f4237a459240 100644
--- a/cc/tiles/picture_layer_tiling_set.h
+++ b/cc/tiles/picture_layer_tiling_set.h
@@ -63,22 +63,22 @@ class CC_EXPORT PictureLayerTilingSet {
       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;
@@ -125,9 +125,6 @@ class CC_EXPORT PictureLayerTilingSet {
                             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;
 
@@ -262,8 +259,6 @@ class CC_EXPORT PictureLayerTilingSet {
   gfx::Rect soon_border_rect_in_layer_space_;
   gfx::Rect eventually_rect_in_layer_space_;
 
-  float aspect_ratio_ = 1.f;
-
   friend class Iterator;
 
  private: