ui/gfx: Convert Canvas::FillRectInt() to use gfx::Rect.

chrome/browser/tab_contents/thumbnail_generator_unittest.cc

 // Copyright (c) 2011 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 "base/basictypes.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/tab_contents/thumbnail_generator.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/renderer_host/backing_store_manager.h"
 #include "content/browser/renderer_host/backing_store_skia.h"
 #include "content/browser/renderer_host/mock_render_process_host.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/tab_contents/render_view_host_manager.h"
+#include "content/common/view_messages.h"
 #include "content/public/browser/notification_service.h"
-#include "content/common/view_messages.h"
 #include "content/public/browser/notification_types.h"
 #include "skia/ext/platform_canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/surface/transport_dib.h"
 
 static const int kBitmapWidth = 100;
 static const int kBitmapHeight = 100;
 
@@ skipping 185 matching lines @@
 TEST_F(ThumbnailGeneratorSimpleTest, CalculateBoringScore_Empty) {
   SkBitmap bitmap;
   EXPECT_DOUBLE_EQ(1.0, ThumbnailGenerator::CalculateBoringScore(&bitmap));
 }
 
 TEST_F(ThumbnailGeneratorSimpleTest, CalculateBoringScore_SingleColor) {
   const SkColor kBlack = SkColorSetRGB(0, 0, 0);
   const gfx::Size kSize(20, 10);
   gfx::CanvasSkia canvas(kSize.width(), kSize.height(), true);
   // Fill all pixesl in black.
-  canvas.FillRectInt(kBlack, 0, 0, kSize.width(), kSize.height());
+  canvas.FillRect(kBlack, gfx::Rect(0, 0, kSize.width(), kSize.height()));

[Peter Kasting, 2011/10/27 19:17:29]

Nit: Shorter: gfx::Rect(gfx::Point(), kSize); (2 places)

[tfarina, 2011/10/27 20:46:03]

Done.

 
   SkBitmap bitmap =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
   // The thumbnail should deserve the highest boring score.
   EXPECT_DOUBLE_EQ(1.0, ThumbnailGenerator::CalculateBoringScore(&bitmap));
 }
 
 TEST_F(ThumbnailGeneratorSimpleTest, CalculateBoringScore_TwoColors) {
   const SkColor kBlack = SkColorSetRGB(0, 0, 0);
   const SkColor kWhite = SkColorSetRGB(0xFF, 0xFF, 0xFF);
   const gfx::Size kSize(20, 10);
 
   gfx::CanvasSkia canvas(kSize.width(), kSize.height(), true);
   // Fill all pixesl in black.
-  canvas.FillRectInt(kBlack, 0, 0, kSize.width(), kSize.height());
+  canvas.FillRect(kBlack, gfx::Rect(0, 0, kSize.width(), kSize.height()));
   // Fill the left half pixels in white.
-  canvas.FillRectInt(kWhite, 0, 0, kSize.width() / 2, kSize.height());
+  canvas.FillRect(kWhite, gfx::Rect(0, 0, kSize.width() / 2, kSize.height()));
 
   SkBitmap bitmap =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
   ASSERT_EQ(kSize.width(), bitmap.width());
   ASSERT_EQ(kSize.height(), bitmap.height());
   // The thumbnail should be less boring because two colors are used.
   EXPECT_DOUBLE_EQ(0.5, ThumbnailGenerator::CalculateBoringScore(&bitmap));
 }
 
 TEST_F(ThumbnailGeneratorSimpleTest, GetClippedBitmap_TallerThanWide) {
@@ skipping 154 matching lines @@
   good_score.good_clipping = true;
   good_score.boring_score = 0.0;
   good_score.load_completed = true;
   top_sites->AddKnownURL(kGoodURL, good_score);
 
   // Should be false, as the existing thumbnail is good enough (i.e. don't
   // need to replace the existing thumbnail which is new and good).
   EXPECT_FALSE(ThumbnailGenerator::ShouldUpdateThumbnail(
       &profile, top_sites.get(), kGoodURL));
 }