From be172ba8194e48970d90e9d873160b259df69b96 Mon Sep 17 00:00:00 2001 From: "piman@chromium.org" Date: Wed, 5 Oct 2011 19:05:07 +0000 Subject: Allow CanvasSkia to bind to an existing SkCanvas. BUG=None TEST=None Review URL: http://codereview.chromium.org/8122013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104146 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/renderer_host/backing_store_skia.cc | 2 +- content/browser/renderer_host/render_widget_host_unittest.cc | 3 ++- content/browser/renderer_host/render_widget_host_view_win.cc | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'content/browser/renderer_host') diff --git a/content/browser/renderer_host/backing_store_skia.cc b/content/browser/renderer_host/backing_store_skia.cc index 56dfc86..1c04363 100644 --- a/content/browser/renderer_host/backing_store_skia.cc +++ b/content/browser/renderer_host/backing_store_skia.cc @@ -31,7 +31,7 @@ BackingStoreSkia::~BackingStoreSkia() { void BackingStoreSkia::SkiaShowRect(const gfx::Point& point, gfx::Canvas* canvas) { - canvas->AsCanvasSkia()->drawBitmap(bitmap_, + canvas->GetSkCanvas()->drawBitmap(bitmap_, SkIntToScalar(point.x()), SkIntToScalar(point.y())); } diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc index 6b9397c..4f74039 100644 --- a/content/browser/renderer_host/render_widget_host_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_unittest.cc @@ -431,7 +431,8 @@ TEST_F(RenderWidgetHostTest, Background) { canvas.FillRectInt(SK_ColorWHITE, 2, 0, 2, 2); canvas.FillRectInt(SK_ColorWHITE, 0, 2, 2, 2); canvas.FillRectInt(SK_ColorBLACK, 2, 2, 2, 2); - const SkBitmap& background = canvas.getDevice()->accessBitmap(false); + const SkBitmap& background = + canvas.sk_canvas()->getDevice()->accessBitmap(false); // Set the background and make sure we get back a copy. view->SetBackground(background); 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 15beefb..ff9d53f 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -162,7 +162,7 @@ void DrawDeemphasized(const SkColor& color, HDC paint_dc) { gfx::CanvasSkia canvas(paint_rect.width(), paint_rect.height(), true); { - skia::ScopedPlatformPaint scoped_platform_paint(&canvas); + skia::ScopedPlatformPaint scoped_platform_paint(canvas.sk_canvas()); HDC dc = scoped_platform_paint.GetPlatformSurface(); BitBlt(dc, 0, @@ -175,7 +175,7 @@ void DrawDeemphasized(const SkColor& color, SRCCOPY); } canvas.FillRectInt(color, 0, 0, paint_rect.width(), paint_rect.height()); - skia::DrawToNativeContext(&canvas, paint_dc, paint_rect.x(), + skia::DrawToNativeContext(canvas.sk_canvas(), paint_dc, paint_rect.x(), paint_rect.y(), NULL); } @@ -966,8 +966,8 @@ void RenderWidgetHostViewWin::DrawBackground(const RECT& dirty_rect, dc_rect.right - dc_rect.left, dc_rect.bottom - dc_rect.top); - skia::DrawToNativeContext(&canvas, *dc, dirty_rect.left, dirty_rect.top, - NULL); + skia::DrawToNativeContext(canvas.sk_canvas(), *dc, dirty_rect.left, + dirty_rect.top, NULL); } else { HBRUSH white_brush = reinterpret_cast(GetStockObject(WHITE_BRUSH)); dc->FillRect(&dirty_rect, white_brush); -- cgit v1.1