cc: Remove separate x/y raster scales.

cc/tiles/tile.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_TILE_H_
 #define CC_TILES_TILE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 11 matching lines @@
 
 class CC_EXPORT Tile {
  public:
   class CC_EXPORT CreateInfo {
    public:
     const PictureLayerTiling* tiling;
     int tiling_i_index;
     int tiling_j_index;
     gfx::Rect enclosing_layer_rect;
     gfx::Rect content_rect;
-    gfx::SizeF raster_scales;
+    float contents_scale;
 
     CreateInfo(const PictureLayerTiling* tiling,
                int tiling_i_index,
                int tiling_j_index,
                const gfx::Rect& enclosing_layer_rect,
                const gfx::Rect& content_rect,
-               const gfx::SizeF& raster_scales)
+               float contents_scale)
         : tiling(tiling),
           tiling_i_index(tiling_i_index),
           tiling_j_index(tiling_j_index),
           enclosing_layer_rect(enclosing_layer_rect),
           content_rect(content_rect),
-          raster_scales(raster_scales) {}
+          contents_scale(contents_scale) {}
   };
 
   enum TileRasterFlags { USE_PICTURE_ANALYSIS = 1 << 0, IS_OPAQUE = 1 << 1 };
 
   typedef uint64_t Id;
 
   ~Tile();
 
   Id id() const {
     return id_;
@@ skipping 13 matching lines @@
     return !!(flags_ & USE_PICTURE_ANALYSIS);
   }
 
   bool is_opaque() const { return !!(flags_ & IS_OPAQUE); }
 
   void AsValueInto(base::trace_event::TracedValue* value) const;
 
   const TileDrawInfo& draw_info() const { return draw_info_; }
   TileDrawInfo& draw_info() { return draw_info_; }
 
-  float contents_scale_key() const { return raster_scales_.width(); }
-  const gfx::SizeF& raster_scales() const { return raster_scales_; }
+  float contents_scale() const { return contents_scale_; }
   const gfx::Rect& content_rect() const { return content_rect_; }
   const gfx::Rect& enclosing_layer_rect() const {
     return enclosing_layer_rect_;
   }
 
   int layer_id() const { return layer_id_; }
 
   int source_frame_number() const { return source_frame_number_; }
 
   size_t GPUMemoryUsageInBytes() const;
@@ skipping 35 matching lines @@
   Tile(TileManager* tile_manager,
        const CreateInfo& info,
        int layer_id,
        int source_frame_number,
        int flags);
 
   TileManager* const tile_manager_;
   const PictureLayerTiling* tiling_;
   const gfx::Rect content_rect_;
   const gfx::Rect enclosing_layer_rect_;
-  const gfx::SizeF raster_scales_;
+  const float contents_scale_;
 
   TileDrawInfo draw_info_;
 
   const int layer_id_;
   const int source_frame_number_;
   const int flags_;
   const int tiling_i_index_;
   const int tiling_j_index_;
   bool required_for_activation_ : 1;
   bool required_for_draw_ : 1;
   bool is_solid_color_analysis_performed_ : 1;
 
   Id id_;
 
   // The rect bounding the changes in this Tile vs the previous tile it
   // replaced.
   gfx::Rect invalidated_content_rect_;
   // The |id_| of the Tile that was invalidated and replaced by this tile.
   Id invalidated_id_;
 
   unsigned scheduled_priority_;
   scoped_refptr<TileTask> raster_task_;
 
   DISALLOW_COPY_AND_ASSIGN(Tile);
 };
 
 }  // namespace cc
 
 #endif  // CC_TILES_TILE_H_