diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 00:11:05 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 00:11:05 +0000 |
| commit | e728d1dbb22389af68d1adad7b18b985cde3bba1 (patch) | |
| tree | b760162eea5504ac6fe637e2cc6d9a0f62b07432 /content | |
| parent | 6b1ac06375f8f41be58938a5e94bcf5af0086ee2 (diff) | |
| download | chromium_src-e728d1dbb22389af68d1adad7b18b985cde3bba1.zip chromium_src-e728d1dbb22389af68d1adad7b18b985cde3bba1.tar.gz chromium_src-e728d1dbb22389af68d1adad7b18b985cde3bba1.tar.bz2 | |
ui/gfx: Convert Canvas::FillRectInt() to use gfx::Rect.
BUG=100898
R=pkasting@chromium.org
Review URL: http://codereview.chromium.org/8405002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107907 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
3 files changed, 8 insertions, 8 deletions
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc index c5a5769..3fc1e00 100644 --- a/content/browser/renderer_host/render_widget_host_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_unittest.cc @@ -428,10 +428,10 @@ TEST_F(RenderWidgetHostTest, Background) { // Create a checkerboard background to test with. gfx::CanvasSkia canvas(4, 4, true); - canvas.FillRectInt(SK_ColorBLACK, 0, 0, 2, 2); - canvas.FillRectInt(SK_ColorWHITE, 2, 0, 2, 2); - canvas.FillRectInt(SK_ColorWHITE, 0, 2, 2, 2); - canvas.FillRectInt(SK_ColorBLACK, 2, 2, 2, 2); + canvas.FillRect(SK_ColorBLACK, gfx::Rect(0, 0, 2, 2)); + canvas.FillRect(SK_ColorWHITE, gfx::Rect(2, 0, 2, 2)); + canvas.FillRect(SK_ColorWHITE, gfx::Rect(0, 2, 2, 2)); + canvas.FillRect(SK_ColorBLACK, gfx::Rect(2, 2, 2, 2)); const SkBitmap& background = canvas.sk_canvas()->getDevice()->accessBitmap(false); diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index 5feacd8..6601a54 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "content/browser/renderer_host/backing_store_skia.h" -#include "content/browser/renderer_host/web_input_event_aura.h" #include "content/browser/renderer_host/render_widget_host.h" +#include "content/browser/renderer_host/web_input_event_aura.h" #include "content/public/browser/native_web_keyboard_event.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "ui/aura/aura_constants.h" @@ -437,8 +437,8 @@ void RenderWidgetHostViewAura::OnPaint(gfx::Canvas* canvas) { static_cast<BackingStoreSkia*>(backing_store)->SkiaShowRect(gfx::Point(), canvas); } else { - canvas->FillRectInt(SK_ColorWHITE, 0, 0, window_->bounds().width(), - window_->bounds().height()); + canvas->FillRect(SK_ColorWHITE, + gfx::Rect(gfx::Point(), window_->bounds().size())); } } diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc index 0873015..fe78c3b 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -176,7 +176,7 @@ void DrawDeemphasized(const SkColor& color, paint_rect.y(), SRCCOPY); } - canvas.FillRectInt(color, 0, 0, paint_rect.width(), paint_rect.height()); + canvas.FillRect(color, gfx::Rect(gfx::Point(), paint_rect.size())); skia::DrawToNativeContext(canvas.sk_canvas(), paint_dc, paint_rect.x(), paint_rect.y(), NULL); } |