From 74db48eb22cd8bfe4d028418d99e7aee6c220930 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Fri, 25 Jun 2010 16:33:23 +0000 Subject: Canvas refactoring part 3. - Replace Canvas instance users with CanvasSkia users. - Rename Canvas2 to Canvas. - Delete Canvas subclass of CanvasSkia. This has created some ugliness around the fact that people that used SkCanvas methods on Canvas now have to go through AsCanvasSkia first. This is temporary ugliness that will be eradicated as I incrementally build out the new Canvas API. BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50854 0039d316-1c4b-4281-b951-d872f2087c98 --- views/widget/root_view_win.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'views/widget/root_view_win.cc') diff --git a/views/widget/root_view_win.cc b/views/widget/root_view_win.cc index 3c9706d..ab885d0 100644 --- a/views/widget/root_view_win.cc +++ b/views/widget/root_view_win.cc @@ -9,7 +9,6 @@ #include "app/os_exchange_data_provider_win.h" #include "base/base_drag_source.h" #include "base/logging.h" -#include "gfx/canvas_2.h" #include "gfx/canvas_skia.h" namespace views { @@ -25,12 +24,12 @@ void RootView::OnPaint(HWND hwnd) { RECT win_version = original_dirty_region.ToRECT(); InvalidateRect(hwnd, &win_version, FALSE); } - scoped_ptr canvas( - gfx::CanvasPaint2::CreateCanvasPaint(hwnd)); + scoped_ptr canvas( + gfx::CanvasPaint::CreateCanvasPaint(hwnd)); if (!canvas->IsValid()) { SchedulePaint(canvas->GetInvalidRect(), false); if (NeedsPainting(false)) - ProcessPaint(canvas->AsCanvas2()->AsCanvas()); + ProcessPaint(canvas->AsCanvas()); } } -- cgit v1.1