cc: Remove separate x/y raster scales.

cc/playback/raster_source_unittest.cc

 // Copyright 2013 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.
 
 #include "cc/playback/raster_source.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 30 matching lines @@
                                              solid_paint);
   recording_source->Rerecord();
 
   scoped_refptr<RasterSource> raster =
       RasterSource::CreateFromRecordingSource(recording_source.get(), false);
 
   // Ensure everything is solid.
   for (int y = 0; y <= 300; y += 100) {
     for (int x = 0; x <= 300; x += 100) {
       gfx::Rect rect(x, y, 100, 100);
-      is_solid_color =
-          raster->PerformSolidColorAnalysis(rect, gfx::SizeF(1.f, 1.f), &color);
+      is_solid_color = raster->PerformSolidColorAnalysis(rect, 1.f, &color);
       EXPECT_TRUE(is_solid_color) << rect.ToString();
       EXPECT_EQ(solid_color, color) << rect.ToString();
     }
   }
 
   // Add one non-solid pixel and recreate the raster source.
   recording_source->add_draw_rect_with_paint(gfx::Rect(50, 50, 1, 1),
                                              non_solid_paint);
   recording_source->Rerecord();
   raster =
       RasterSource::CreateFromRecordingSource(recording_source.get(), false);
 
   color = SK_ColorTRANSPARENT;
-  is_solid_color = raster->PerformSolidColorAnalysis(
-      gfx::Rect(0, 0, 100, 100), gfx::SizeF(1.f, 1.f), &color);
+  is_solid_color =
+      raster->PerformSolidColorAnalysis(gfx::Rect(0, 0, 100, 100), 1.f, &color);
   EXPECT_FALSE(is_solid_color);
 
   color = SK_ColorTRANSPARENT;
   is_solid_color = raster->PerformSolidColorAnalysis(
-      gfx::Rect(100, 0, 100, 100), gfx::SizeF(1.f, 1.f), &color);
+      gfx::Rect(100, 0, 100, 100), 1.f, &color);
   EXPECT_TRUE(is_solid_color);
   EXPECT_EQ(solid_color, color);
 
   // Boundaries should be clipped.
   color = SK_ColorTRANSPARENT;
   is_solid_color = raster->PerformSolidColorAnalysis(
-      gfx::Rect(350, 0, 100, 100), gfx::SizeF(1.f, 1.f), &color);
+      gfx::Rect(350, 0, 100, 100), 1.f, &color);
   EXPECT_TRUE(is_solid_color);
   EXPECT_EQ(solid_color, color);
 
   color = SK_ColorTRANSPARENT;
   is_solid_color = raster->PerformSolidColorAnalysis(
-      gfx::Rect(0, 350, 100, 100), gfx::SizeF(1.f, 1.f), &color);
+      gfx::Rect(0, 350, 100, 100), 1.f, &color);
   EXPECT_TRUE(is_solid_color);
   EXPECT_EQ(solid_color, color);
 
   color = SK_ColorTRANSPARENT;
   is_solid_color = raster->PerformSolidColorAnalysis(
-      gfx::Rect(350, 350, 100, 100), gfx::SizeF(1.f, 1.f), &color);
+      gfx::Rect(350, 350, 100, 100), 1.f, &color);
   EXPECT_TRUE(is_solid_color);
   EXPECT_EQ(solid_color, color);
 }
 
 TEST(RasterSourceTest, AnalyzeIsSolidScaled) {
   gfx::Size layer_bounds(400, 400);
 
   std::unique_ptr<FakeRecordingSource> recording_source =
       FakeRecordingSource::CreateFilledRecordingSource(layer_bounds);
 
@@ skipping 11 matching lines @@
                                              solid_paint);
   recording_source->Rerecord();
 
   scoped_refptr<RasterSource> raster =
       RasterSource::CreateFromRecordingSource(recording_source.get(), false);
 
   // Ensure everything is solid.
   for (int y = 0; y <= 30; y += 10) {
     for (int x = 0; x <= 30; x += 10) {
       gfx::Rect rect(x, y, 10, 10);
-      is_solid_color = raster->PerformSolidColorAnalysis(
-          rect, gfx::SizeF(0.1f, 0.1f), &color);
+      is_solid_color = raster->PerformSolidColorAnalysis(rect, 0.1f, &color);
       EXPECT_TRUE(is_solid_color) << rect.ToString();
       EXPECT_EQ(color, solid_color) << rect.ToString();
     }
   }
 
   // Add one non-solid pixel and recreate the raster source.
   recording_source->add_draw_rect_with_paint(gfx::Rect(50, 50, 1, 1),
                                              non_solid_paint);
   recording_source->Rerecord();
   raster =
       RasterSource::CreateFromRecordingSource(recording_source.get(), false);
 
   color = SK_ColorTRANSPARENT;
-  is_solid_color = raster->PerformSolidColorAnalysis(
-      gfx::Rect(0, 0, 10, 10), gfx::SizeF(0.1f, 0.1f), &color);
+  is_solid_color =
+      raster->PerformSolidColorAnalysis(gfx::Rect(0, 0, 10, 10), 0.1f, &color);
   EXPECT_FALSE(is_solid_color);
 
   color = SK_ColorTRANSPARENT;
-  is_solid_color = raster->PerformSolidColorAnalysis(
-      gfx::Rect(10, 0, 10, 10), gfx::SizeF(0.1f, 0.1f), &color);
+  is_solid_color =
+      raster->PerformSolidColorAnalysis(gfx::Rect(10, 0, 10, 10), 0.1f, &color);
   EXPECT_TRUE(is_solid_color);
   EXPECT_EQ(color, solid_color);
 
   // Boundaries should be clipped.
   color = SK_ColorTRANSPARENT;
-  is_solid_color = raster->PerformSolidColorAnalysis(
-      gfx::Rect(35, 0, 10, 10), gfx::SizeF(0.1f, 0.1f), &color);
+  is_solid_color =
+      raster->PerformSolidColorAnalysis(gfx::Rect(35, 0, 10, 10), 0.1f, &color);
   EXPECT_TRUE(is_solid_color);
   EXPECT_EQ(color, solid_color);
 
   color = SK_ColorTRANSPARENT;
-  is_solid_color = raster->PerformSolidColorAnalysis(
-      gfx::Rect(0, 35, 10, 10), gfx::SizeF(0.1f, 0.1f), &color);
+  is_solid_color =
+      raster->PerformSolidColorAnalysis(gfx::Rect(0, 35, 10, 10), 0.1f, &color);
   EXPECT_TRUE(is_solid_color);
   EXPECT_EQ(color, solid_color);
 
   color = SK_ColorTRANSPARENT;
-  is_solid_color = raster->PerformSolidColorAnalysis(
-      gfx::Rect(35, 35, 10, 10), gfx::SizeF(0.1f, 0.1f), &color);
+  is_solid_color = raster->PerformSolidColorAnalysis(gfx::Rect(35, 35, 10, 10),
+                                                     0.1f, &color);
   EXPECT_TRUE(is_solid_color);
   EXPECT_EQ(color, solid_color);
 }
 
 TEST(RasterSourceTest, AnalyzeIsSolidEmpty) {
   gfx::Size layer_bounds(400, 400);
 
   std::unique_ptr<FakeRecordingSource> recording_source =
       FakeRecordingSource::CreateFilledRecordingSource(layer_bounds);
   recording_source->Rerecord();
 
   scoped_refptr<RasterSource> raster =
       RasterSource::CreateFromRecordingSource(recording_source.get(), false);
 
   SkColor color = SK_ColorTRANSPARENT;
-  bool is_solid_color = raster->PerformSolidColorAnalysis(
-      gfx::Rect(0, 0, 400, 400), gfx::SizeF(1.f, 1.f), &color);
+  bool is_solid_color =
+      raster->PerformSolidColorAnalysis(gfx::Rect(0, 0, 400, 400), 1.f, &color);
 
   EXPECT_TRUE(is_solid_color);
   EXPECT_EQ(color, SkColorSetARGB(0, 0, 0, 0));
 }
 
 TEST(RasterSourceTest, PixelRefIteratorDiscardableRefsOneTile) {
   gfx::Size layer_bounds(512, 512);
 
   std::unique_ptr<FakeRecordingSource> recording_source =
       FakeRecordingSource::CreateFilledRecordingSource(layer_bounds);
@@ skipping 15 matching lines @@
                                    gfx::Point(260, 260));
   recording_source->SetGenerateDiscardableImagesMetadata(true);
   recording_source->Rerecord();
 
   scoped_refptr<RasterSource> raster =
       RasterSource::CreateFromRecordingSource(recording_source.get(), false);
 
   // Tile sized iterators. These should find only one pixel ref.
   {
     std::vector<DrawImage> images;
-    raster->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256),
-                                       gfx::SizeF(1.f, 1.f), &images);
+    raster->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256), 1.f, &images);
     EXPECT_EQ(1u, images.size());
     EXPECT_EQ(discardable_image[0][0], images[0].image());
   }
   // Shifted tile sized iterators. These should find only one pixel ref.
   {
     std::vector<DrawImage> images;
-    raster->GetDiscardableImagesInRect(gfx::Rect(260, 260, 256, 256),
-                                       gfx::SizeF(1.f, 1.f), &images);
+    raster->GetDiscardableImagesInRect(gfx::Rect(260, 260, 256, 256), 1.f,
+                                       &images);
     EXPECT_EQ(1u, images.size());
     EXPECT_EQ(discardable_image[1][1], images[0].image());
   }
   // Ensure there's no discardable pixel refs in the empty cell
   {
     std::vector<DrawImage> images;
-    raster->GetDiscardableImagesInRect(gfx::Rect(0, 256, 256, 256),
-                                       gfx::SizeF(1.f, 1.f), &images);
+    raster->GetDiscardableImagesInRect(gfx::Rect(0, 256, 256, 256), 1.f,
+                                       &images);
     EXPECT_EQ(0u, images.size());
   }
   // Layer sized iterators. These should find three pixel ref.
   {
     std::vector<DrawImage> images;
-    raster->GetDiscardableImagesInRect(gfx::Rect(0, 0, 512, 512),
-                                       gfx::SizeF(1.f, 1.f), &images);
+    raster->GetDiscardableImagesInRect(gfx::Rect(0, 0, 512, 512), 1.f, &images);
     EXPECT_EQ(3u, images.size());
     EXPECT_EQ(discardable_image[0][0], images[0].image());
     EXPECT_EQ(discardable_image[0][1], images[1].image());
     EXPECT_EQ(discardable_image[1][1], images[2].image());
   }
 }
 
 TEST(RasterSourceTest, RasterFullContents) {
   gfx::Size layer_bounds(3, 5);
   float contents_scale = 1.5f;
@@ skipping 33 matching lines @@
       // Outside of that is undefined.
       gfx::Rect canvas_rect(content_rect);
       canvas_rect.Inset(0, 0, -1, -1);
 
       SkBitmap bitmap;
       bitmap.allocN32Pixels(canvas_rect.width(), canvas_rect.height());
       SkCanvas canvas(bitmap);
       canvas.clear(SK_ColorTRANSPARENT);
 
       raster->PlaybackToCanvas(&canvas, canvas_rect, canvas_rect,
-                               gfx::SizeF(contents_scale, contents_scale),
+                               contents_scale,
                                RasterSource::PlaybackSettings());
 
       SkColor* pixels = reinterpret_cast<SkColor*>(bitmap.getPixels());
       int num_pixels = bitmap.width() * bitmap.height();
       bool all_white = true;
       for (int i = 0; i < num_pixels; ++i) {
         EXPECT_EQ(SkColorGetA(pixels[i]), 255u);
         all_white &= (SkColorGetR(pixels[i]) == 255);
         all_white &= (SkColorGetG(pixels[i]) == 255);
         all_white &= (SkColorGetB(pixels[i]) == 255);
@@ skipping 31 matching lines @@
 
   SkBitmap bitmap;
   bitmap.allocN32Pixels(content_bounds.width(), content_bounds.height());
   SkCanvas canvas(bitmap);
   canvas.clear(SK_ColorTRANSPARENT);
 
   // Playback the full rect which should make everything white.
   gfx::Rect raster_full_rect(content_bounds);
   gfx::Rect playback_rect(content_bounds);
   raster->PlaybackToCanvas(&canvas, raster_full_rect, playback_rect,
-                           gfx::SizeF(contents_scale, contents_scale),
-                           RasterSource::PlaybackSettings());
+                           contents_scale, RasterSource::PlaybackSettings());
 
   {
     SkColor* pixels = reinterpret_cast<SkColor*>(bitmap.getPixels());
     for (int i = 0; i < bitmap.width(); ++i) {
       for (int j = 0; j < bitmap.height(); ++j) {
         SCOPED_TRACE(i);
         SCOPED_TRACE(j);
         EXPECT_EQ(255u, SkColorGetA(pixels[i + j * bitmap.width()]));
         EXPECT_EQ(255u, SkColorGetR(pixels[i + j * bitmap.width()]));
         EXPECT_EQ(255u, SkColorGetG(pixels[i + j * bitmap.width()]));
@@ skipping 10 matching lines @@
   recording_source->Rerecord();
 
   // Make a new RasterSource from the new recording.
   raster =
       RasterSource::CreateFromRecordingSource(recording_source.get(), false);
 
   // We're going to playback from "everything is black" into a smaller area,
   // that touches the edge pixels of the recording.
   playback_rect.Inset(1, 2, 0, 1);
   raster->PlaybackToCanvas(&canvas, raster_full_rect, playback_rect,
-                           gfx::SizeF(contents_scale, contents_scale),
-                           RasterSource::PlaybackSettings());
+                           contents_scale, RasterSource::PlaybackSettings());
 
   SkColor* pixels = reinterpret_cast<SkColor*>(bitmap.getPixels());
   int num_black = 0;
   int num_white = 0;
   for (int i = 0; i < bitmap.width(); ++i) {
     for (int j = 0; j < bitmap.height(); ++j) {
       SCOPED_TRACE(j);
       SCOPED_TRACE(i);
       bool expect_black = playback_rect.Contains(i, j);
       if (expect_black) {
@@ skipping 43 matching lines @@
 
   SkBitmap bitmap;
   bitmap.allocN32Pixels(content_bounds.width(), content_bounds.height());
   SkCanvas canvas(bitmap);
   canvas.clear(SK_ColorTRANSPARENT);
 
   // Playback the full rect which should make everything light gray (alpha=10).
   gfx::Rect raster_full_rect(content_bounds);
   gfx::Rect playback_rect(content_bounds);
   raster->PlaybackToCanvas(&canvas, raster_full_rect, playback_rect,
-                           gfx::SizeF(contents_scale, contents_scale),
-                           RasterSource::PlaybackSettings());
+                           contents_scale, RasterSource::PlaybackSettings());
 
   {
     SkColor* pixels = reinterpret_cast<SkColor*>(bitmap.getPixels());
     for (int i = 0; i < bitmap.width(); ++i) {
       for (int j = 0; j < bitmap.height(); ++j) {
         SCOPED_TRACE(i);
         SCOPED_TRACE(j);
         EXPECT_EQ(alpha_dark, SkColorGetA(pixels[i + j * bitmap.width()]));
         EXPECT_EQ(alpha_dark, SkColorGetR(pixels[i + j * bitmap.width()]));
         EXPECT_EQ(alpha_dark, SkColorGetG(pixels[i + j * bitmap.width()]));
@@ skipping 18 matching lines @@
   // Make a new RasterSource from the new recording.
   raster = RasterSource::CreateFromRecordingSource(recording_source_light.get(),
                                                    false);
 
   // We're going to playback from alpha(18) white rectangle into a smaller area
   // of the recording resulting in a smaller lighter white rectangle over a
   // darker white background rectangle.
   playback_rect =
       gfx::Rect(gfx::ScaleToCeiledSize(partial_bounds, contents_scale));
   raster->PlaybackToCanvas(&canvas, raster_full_rect, playback_rect,
-                           gfx::SizeF(contents_scale, contents_scale),
-                           RasterSource::PlaybackSettings());
+                           contents_scale, RasterSource::PlaybackSettings());
 
   // Test that the whole playback_rect was cleared and repainted with new alpha.
   SkColor* pixels = reinterpret_cast<SkColor*>(bitmap.getPixels());
   for (int i = 0; i < playback_rect.width(); ++i) {
     for (int j = 0; j < playback_rect.height(); ++j) {
       SCOPED_TRACE(j);
       SCOPED_TRACE(i);
       EXPECT_EQ(alpha_light, SkColorGetA(pixels[i + j * bitmap.width()]));
       EXPECT_EQ(alpha_light, SkColorGetR(pixels[i + j * bitmap.width()]));
       EXPECT_EQ(alpha_light, SkColorGetG(pixels[i + j * bitmap.width()]));
@@ skipping 18 matching lines @@
   gfx::Size content_bounds(
       gfx::ScaleToCeiledSize(layer_bounds, contents_scale));
 
   gfx::Rect canvas_rect(content_bounds);
   canvas_rect.Inset(0, 0, -1, -1);
 
   SkBitmap bitmap;
   bitmap.allocN32Pixels(canvas_rect.width(), canvas_rect.height());
   SkCanvas canvas(bitmap);
 
-  raster->PlaybackToCanvas(&canvas, canvas_rect, canvas_rect,
-                           gfx::SizeF(contents_scale, contents_scale),
+  raster->PlaybackToCanvas(&canvas, canvas_rect, canvas_rect, contents_scale,
                            RasterSource::PlaybackSettings());
 
   SkColor* pixels = reinterpret_cast<SkColor*>(bitmap.getPixels());
   int num_pixels = bitmap.width() * bitmap.height();
   for (int i = 0; i < num_pixels; ++i) {
     EXPECT_EQ(SkColorGetA(pixels[i]), 0u);
   }
 }
 
 TEST(RasterSourceTest, GetPictureMemoryUsageIncludesClientReportedMemory) {
@@ skipping 53 matching lines @@
 
   SkBitmap bitmap;
   bitmap.allocN32Pixels(size.width() * 0.5f, size.height() * 0.25f);
   SkCanvas canvas(bitmap);
   canvas.scale(0.5f, 0.25f);
 
   RasterSource::PlaybackSettings settings;
   settings.playback_to_shared_canvas = true;
   settings.use_image_hijack_canvas = true;
   raster_source->PlaybackToCanvas(&canvas, gfx::Rect(size), gfx::Rect(size),
-                                  gfx::SizeF(1.f, 1.f), settings);
+                                  1.f, settings);
 
   EXPECT_EQ(SK_ColorGREEN, bitmap.getColor(0, 0));
   EXPECT_EQ(SK_ColorGREEN, bitmap.getColor(49, 0));
   EXPECT_EQ(SK_ColorGREEN, bitmap.getColor(0, 24));
   EXPECT_EQ(SK_ColorGREEN, bitmap.getColor(49, 24));
   for (int x = 0; x < 49; ++x)
     EXPECT_EQ(SK_ColorRED, bitmap.getColor(x, 12));
   for (int y = 0; y < 24; ++y)
     EXPECT_EQ(SK_ColorRED, bitmap.getColor(24, y));
 }
 
 }  // namespace
 }  // namespace cc