cc: Remove separate x/y raster scales.

cc/playback/raster_source.h

 // Copyright 2014 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_PLAYBACK_RASTER_SOURCE_H_
 #define CC_PLAYBACK_RASTER_SOURCE_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 33 matching lines @@
   };
 
   static scoped_refptr<RasterSource> CreateFromRecordingSource(
       const RecordingSource* other,
       bool can_use_lcd_text);
 
   // TODO(trchen): Deprecated.
   void PlaybackToCanvas(SkCanvas* canvas,
                         const gfx::Rect& canvas_bitmap_rect,
                         const gfx::Rect& canvas_playback_rect,
-                        const gfx::SizeF& raster_scales,
+                        float contents_scale,
                         const PlaybackSettings& settings) const;
 
   // Raster this RasterSource into the given canvas. Canvas states such as
   // CTM and clip region will be respected. This function will replace pixels
   // in the clip region without blending. It is assumed that existing pixels
   // may be uninitialized and will be cleared before playback.
   //
   // Virtual for testing.
   //
   // Note that this should only be called after the image decode controller has
   // been set, which happens during commit.
   virtual void PlaybackToCanvas(SkCanvas* canvas,
                                 const PlaybackSettings& settings) const;
 
   // Returns whether the given rect at given scale is of solid color in
   // this raster source, as well as the solid color value.
   bool PerformSolidColorAnalysis(const gfx::Rect& content_rect,
-                                 const gfx::SizeF& raster_scales,
+                                 float contents_scale,
                                  SkColor* color) const;
 
   // Returns true iff the whole raster source is of solid color.
   bool IsSolidColor() const;
 
   // Returns the color of the raster source if it is solid color. The results
   // are unspecified if IsSolidColor returns false.
   SkColor GetSolidColor() const;
 
   // Returns the size of this raster source.
   gfx::Size GetSize() const;
 
   // Returns whether or not there was a color space implied by the raster source
   // when it was created. If this returns true then no color correction is
   // to be applied at rasterization time, and the result of rasterization is to
   // be interpreted as being in this color space. If this returns falce, then
   // then a destination color space must be specified at raster time.
   bool HasImpliedColorSpace() const;
   const gfx::ColorSpace& GetImpliedColorSpace() const;
 
   // Populate the given list with all images that may overlap the given
   // rect in layer space. The returned draw images' matrices are modified as if
   // they were being using during raster at scale |raster_scale|.
   void GetDiscardableImagesInRect(const gfx::Rect& layer_rect,
-                                  const gfx::SizeF& raster_scales,
+                                  float contents_scale,
                                   std::vector<DrawImage>* images) const;
 
   // Return true iff this raster source can raster the given rect in layer
   // space.
   bool CoversRect(const gfx::Rect& layer_rect) const;
 
   // Returns true if this raster source has anything to rasterize.
   virtual bool HasRecordings() const;
 
   // Valid rectangle in which everything is recorded and can be rastered from.
@@ skipping 46 matching lines @@
   void RasterCommon(SkCanvas* canvas, SkPicture::AbortCallback* callback) const;
 
   void PrepareForPlaybackToCanvas(SkCanvas* canvas) const;
 
   DISALLOW_COPY_AND_ASSIGN(RasterSource);
 };
 
 }  // namespace cc
 
 #endif  // CC_PLAYBACK_RASTER_SOURCE_H_