From da509107727ce025dac36cbd985ef2312aea7597 Mon Sep 17 00:00:00 2001 From: "danakj@chromium.org" Date: Thu, 6 Dec 2012 17:44:45 +0000 Subject: chrome: Use skia::RefPtr for skia ref-counted objects. BUG=163454 R=sky Depends on: https://codereview.chromium.org/11299262 NOTRY=true Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=171333 Review URL: https://codereview.chromium.org/11280251 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171524 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/renderer/chrome_render_view_observer.cc | 8 ++++---- chrome/renderer/safe_browsing/phishing_thumbnailer.cc | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'chrome/renderer') diff --git a/chrome/renderer/chrome_render_view_observer.cc b/chrome/renderer/chrome_render_view_observer.cc index 8c764b5..2c52886 100644 --- a/chrome/renderer/chrome_render_view_observer.cc +++ b/chrome/renderer/chrome_render_view_observer.cc @@ -817,13 +817,13 @@ bool ChromeRenderViewObserver::CaptureSnapshot(WebView* view, view->layout(); const WebSize& size = view->size(); - SkCanvas* canvas = skia::CreatePlatformCanvas(size.width, size.height, true, - NULL, skia::RETURN_NULL_ON_FAILURE); + skia::RefPtr canvas = skia::AdoptRef( + skia::CreatePlatformCanvas( + size.width, size.height, true, NULL, skia::RETURN_NULL_ON_FAILURE)); if (!canvas) return false; - SkAutoUnref au(canvas); - view->paint(webkit_glue::ToWebCanvas(canvas), + view->paint(webkit_glue::ToWebCanvas(canvas.get()), WebRect(0, 0, size.width, size.height)); // TODO: Add a way to snapshot the whole page, not just the currently // visible part. diff --git a/chrome/renderer/safe_browsing/phishing_thumbnailer.cc b/chrome/renderer/safe_browsing/phishing_thumbnailer.cc index 3b98fea..6df78d8 100644 --- a/chrome/renderer/safe_browsing/phishing_thumbnailer.cc +++ b/chrome/renderer/safe_browsing/phishing_thumbnailer.cc @@ -32,12 +32,12 @@ SkBitmap GrabPhishingThumbnail(content::RenderView* render_view, } WebView* view = render_view->GetWebView(); base::TimeTicks beginning_time = base::TimeTicks::Now(); - SkCanvas* canvas = skia::CreatePlatformCanvas(view_size.width(), - view_size.height(), true, 0, - skia::RETURN_NULL_ON_FAILURE); + skia::RefPtr canvas = skia::AdoptRef( + skia::CreatePlatformCanvas(view_size.width(), + view_size.height(), true, 0, + skia::RETURN_NULL_ON_FAILURE)); if (!canvas) return SkBitmap(); - SkAutoUnref au(canvas); // Make sure we are not using any zoom when we take the snapshot. We will // restore the previous zoom level after the snapshot is taken. @@ -51,7 +51,7 @@ SkBitmap GrabPhishingThumbnail(content::RenderView* render_view, view->mainFrame()->setCanHaveScrollbars(false); // always hide scrollbars. view->resize(view_size); view->layout(); - view->paint(webkit_glue::ToWebCanvas(canvas), + view->paint(webkit_glue::ToWebCanvas(canvas.get()), WebRect(0, 0, view_size.width(), view_size.height())); SkDevice* device = skia::GetTopDevice(*canvas); -- cgit v1.1