Remove uses of skia::ReadPixels(PaintCanvas)

chrome/browser/thumbnails/content_analysis_unittest.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/thumbnails/content_analysis.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 70 matching lines @@
 class ThumbnailContentAnalysisTest : public testing::Test {
 };
 
 TEST_F(ThumbnailContentAnalysisTest, ApplyGradientMagnitudeOnImpulse) {
   gfx::Canvas canvas(gfx::Size(800, 600), 1.0f, true);
 
   // The image consists of a point spike on uniform (non-zero) background.
   canvas.FillRect(gfx::Rect(0, 0, 800, 600), SkColorSetRGB(10, 10, 10));
   canvas.FillRect(gfx::Rect(400, 300, 1, 1), SkColorSetRGB(255, 255, 255));
 
-  SkBitmap source = skia::ReadPixels(canvas.sk_canvas());
+  SkBitmap source = canvas.ToBitmap();
 
   SkBitmap reduced_color;
   reduced_color.allocPixels(SkImageInfo::MakeA8(source.width(),
                                                 source.height()));
 
   gfx::Vector3dF transform(0.299f, 0.587f, 0.114f);
   EXPECT_TRUE(color_utils::ApplyColorReduction(
       source, transform, true, &reduced_color));
 
   float sigma = 2.5f;
@@ skipping 22 matching lines @@
 }
 
 TEST_F(ThumbnailContentAnalysisTest, ApplyGradientMagnitudeOnFrame) {
   gfx::Canvas canvas(gfx::Size(800, 600), 1.0f, true);
 
   // The image consists of a single white block in the centre.
   gfx::Rect draw_rect(300, 200, 200, 200);
   canvas.FillRect(gfx::Rect(0, 0, 800, 600), SkColorSetRGB(0, 0, 0));
   canvas.DrawRect(draw_rect, SkColorSetRGB(255, 255, 255));
 
-  SkBitmap source = skia::ReadPixels(canvas.sk_canvas());
+  SkBitmap source = canvas.ToBitmap();
 
   SkBitmap reduced_color;
   reduced_color.allocPixels(SkImageInfo::MakeA8(source.width(),
                                                 source.height()));
 
   gfx::Vector3dF transform(0.299f, 0.587f, 0.114f);
   EXPECT_TRUE(color_utils::ApplyColorReduction(
       source, transform, true, &reduced_color));
 
   float sigma = 2.5f;
@@ skipping 17 matching lines @@
 
 TEST_F(ThumbnailContentAnalysisTest, ExtractImageProfileInformation) {
   gfx::Canvas canvas(gfx::Size(800, 600), 1.0f, true);
 
   // The image consists of a white frame drawn in the centre.
   gfx::Rect draw_rect(100, 100, 200, 100);
   gfx::Rect image_rect(0, 0, 800, 600);
   canvas.FillRect(image_rect, SkColorSetRGB(0, 0, 0));
   canvas.DrawRect(draw_rect, SkColorSetRGB(255, 255, 255));
 
-  SkBitmap source = skia::ReadPixels(canvas.sk_canvas());
+  SkBitmap source = canvas.ToBitmap();
   SkBitmap reduced_color;
   reduced_color.allocPixels(SkImageInfo::MakeA8(source.width(),
                                                 source.height()));
 
   gfx::Vector3dF transform(1, 0, 0);
   EXPECT_TRUE(color_utils::ApplyColorReduction(
       source, transform, true, &reduced_color));
   std::vector<float> column_profile;
   std::vector<float> row_profile;
   ExtractImageProfileInformation(reduced_color,
@@ skipping 42 matching lines @@
        ExtractImageProfileInformationWithClosing) {
   gfx::Canvas canvas(gfx::Size(800, 600), 1.0f, true);
 
   // The image consists of a two white frames drawn side by side, with a
   // single-pixel vertical gap in between.
   gfx::Rect image_rect(0, 0, 800, 600);
   canvas.FillRect(image_rect, SkColorSetRGB(0, 0, 0));
   canvas.DrawRect(gfx::Rect(300, 250, 99, 100), SkColorSetRGB(255, 255, 255));
   canvas.DrawRect(gfx::Rect(401, 250, 99, 100), SkColorSetRGB(255, 255, 255));
 
-  SkBitmap source = skia::ReadPixels(canvas.sk_canvas());
+  SkBitmap source = canvas.ToBitmap();
   SkBitmap reduced_color;
   reduced_color.allocPixels(SkImageInfo::MakeA8(source.width(),
                                                 source.height()));
 
   gfx::Vector3dF transform(1, 0, 0);
   EXPECT_TRUE(color_utils::ApplyColorReduction(
       source, transform, true, &reduced_color));
   std::vector<float> column_profile;
   std::vector<float> row_profile;
 
@@ skipping 301 matching lines @@
 
   std::vector<bool> rows(image_size.height(), false);
   std::fill_n(rows.begin() + 200, 100, true);
   std::fill_n(rows.begin() + 400, 100, true);
 
   std::vector<bool> columns(image_size.width(), false);
   std::fill_n(columns.begin() + 100, 100, true);
   std::fill_n(columns.begin() + 300, 100, true);
   std::fill_n(columns.begin() + 500, 100, true);
 
-  SkBitmap source = skia::ReadPixels(canvas.sk_canvas());
+  SkBitmap source = canvas.ToBitmap();
   SkBitmap result = ComputeDecimatedImage(source, rows, columns);
   EXPECT_FALSE(result.empty());
   EXPECT_EQ(300, result.width());
   EXPECT_EQ(200, result.height());
 
   // The call should have removed all empty spaces.
   ASSERT_TRUE(CompareImageFragments(source,
                                     result,
                                     gfx::Size(100, 100),
                                     gfx::Point(100, 200),
@@ skipping 91 matching lines @@
         body_rect.height() / 3 * line + margin_vertical;
     const int x = body_rect.x() +
         alignment * body_rect.width() / 2 + margin_vertical;
     gfx::Rect pict_rect(x, y,
                         body_rect.width() / 2 - 2 * margin_vertical,
                         body_rect.height() / 3 - 2 * margin_vertical);
     canvas.FillRect(pict_rect, SkColorSetRGB(255, 255, 255));
     canvas.DrawRect(pict_rect, SkColorSetRGB(0, 0, 0));
   }
 
-  SkBitmap source = skia::ReadPixels(canvas.sk_canvas());
+  SkBitmap source = canvas.ToBitmap();
 
   SkBitmap result = CreateRetargetedThumbnailImage(
       source, gfx::Size(424, 264), 2.5);
   EXPECT_FALSE(result.empty());
 
   // Given the nature of computation We can't really assert much here about the
   // image itself. We know it should have been computed, should be smaller than
   // the original and it must not be zero.
   EXPECT_LT(result.width(), image_size.width());
   EXPECT_LT(result.height(), image_size.height());
 
   int histogram[256] = {};
   color_utils::BuildLumaHistogram(result, histogram);
   int non_zero_color_count = std::count_if(
       histogram, histogram + 256, [](int value) { return value > 0; });
   EXPECT_GT(non_zero_color_count, 4);
 
 }
 
 }  // namespace thumbnailing_utils