diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 07:37:29 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 07:37:29 +0000 |
| commit | 82522511b7921e8c61742ebd80a4c674c56e7e48 (patch) | |
| tree | 381d71de2b9c7b99675e6f2b4523ae0876c72ce8 /chrome/browser/renderer_host | |
| parent | 631cf822bd6e64cf469544b42c9975f5602c29a6 (diff) | |
| download | chromium_src-82522511b7921e8c61742ebd80a4c674c56e7e48.zip chromium_src-82522511b7921e8c61742ebd80a4c674c56e7e48.tar.gz chromium_src-82522511b7921e8c61742ebd80a4c674c56e7e48.tar.bz2 | |
ChromeCanvas->gfx::Canvas
Rename files too.
TBR=brettw
http://crbug.com/11387
Review URL: http://codereview.chromium.org/113443
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16148 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
| -rw-r--r-- | chrome/browser/renderer_host/render_widget_host_unittest.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/renderer_host/render_widget_host_view_win.cc | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_unittest.cc b/chrome/browser/renderer_host/render_widget_host_unittest.cc index 1d0c205..419fccf 100644 --- a/chrome/browser/renderer_host/render_widget_host_unittest.cc +++ b/chrome/browser/renderer_host/render_widget_host_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/gfx/chrome_canvas.h" +#include "app/gfx/canvas.h" #include "base/basictypes.h" #include "base/keyboard_codes.h" #include "base/scoped_ptr.h" @@ -253,7 +253,7 @@ TEST_F(RenderWidgetHostTest, Background) { host_->set_view(view.get()); // Create a checkerboard background to test with. - ChromeCanvas canvas(4, 4, true); + gfx::Canvas 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); @@ -288,7 +288,7 @@ TEST_F(RenderWidgetHostTest, Background) { #endif #else - // TODO(port): Mac does not have ChromeCanvas. Maybe we can just change this + // TODO(port): Mac does not have gfx::Canvas. Maybe we can just change this // test to use SkCanvas directly? #endif diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc index 2252c8d..82d95f1c 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -4,7 +4,7 @@ #include "chrome/browser/renderer_host/render_widget_host_view_win.h" -#include "app/gfx/chrome_canvas.h" +#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "app/resource_bundle.h" @@ -549,7 +549,7 @@ void RenderWidgetHostViewWin::DrawResizeCorner(const gfx::Rect& paint_rect, if (!paint_rect.Intersect(resize_corner_rect).IsEmpty()) { SkBitmap* bitmap = ResourceBundle::GetSharedInstance(). GetBitmapNamed(IDR_TEXTAREA_RESIZER); - ChromeCanvas canvas(bitmap->width(), bitmap->height(), false); + gfx::Canvas canvas(bitmap->width(), bitmap->height(), false); // TODO(jcampan): This const_cast should not be necessary once the // SKIA API has been changed to return a non-const bitmap. const_cast<SkBitmap&>(canvas.getDevice()->accessBitmap(true)). @@ -757,9 +757,9 @@ void RenderWidgetHostViewWin::OnPaint(HDC dc) { void RenderWidgetHostViewWin::DrawBackground(const RECT& dirty_rect, CPaintDC* dc) { if (!background_.empty()) { - ChromeCanvas canvas(dirty_rect.right - dirty_rect.left, - dirty_rect.bottom - dirty_rect.top, - true); // opaque + gfx::Canvas canvas(dirty_rect.right - dirty_rect.left, + dirty_rect.bottom - dirty_rect.top, + true); // opaque canvas.TranslateInt(-dirty_rect.left, -dirty_rect.top); const RECT& dc_rect = dc->m_ps.rcPaint; |