Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4887)

Unified Diff: chrome/browser/android/compositor/layer/crushed_sprite_layer.cc

Issue 1939783002: Remove all uses of skia::RefPtr and stale includes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Florin's nits Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/compositor/layer/crushed_sprite_layer.cc
diff --git a/chrome/browser/android/compositor/layer/crushed_sprite_layer.cc b/chrome/browser/android/compositor/layer/crushed_sprite_layer.cc
index e583ad72a2f9e3220397785a6a6192f53440b859..5c3dae27638e8059d31a6a10629688980eb290b3 100644
--- a/chrome/browser/android/compositor/layer/crushed_sprite_layer.cc
+++ b/chrome/browser/android/compositor/layer/crushed_sprite_layer.cc
@@ -7,6 +7,7 @@
#include "cc/layers/layer.h"
#include "cc/layers/ui_resource_layer.h"
#include "content/public/browser/android/compositor.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
#include "ui/android/resources/crushed_sprite_resource.h"
#include "ui/android/resources/resource_manager.h"
#include "ui/gfx/canvas.h"
@@ -53,7 +54,7 @@ void CrushedSpriteLayer::DrawSpriteFrame(
SkBitmap bitmap;
bitmap.allocN32Pixels(resource->GetUnscaledSpriteSize().width(),
resource->GetUnscaledSpriteSize().height());
- skia::RefPtr<SkCanvas> canvas = skia::AdoptRef(new SkCanvas(bitmap));
+ sk_sp<SkCanvas> canvas = sk_make_sp<SkCanvas>(bitmap);
if (previous_frame_ == -1 ||
sprite_frame == resource->GetFrameCount() - 1) {
@@ -103,7 +104,7 @@ void CrushedSpriteLayer::DrawSpriteFrame(
void CrushedSpriteLayer::DrawRectanglesForFrame(
ui::CrushedSpriteResource* resource,
int frame,
- skia::RefPtr<SkCanvas> canvas) {
+ sk_sp<SkCanvas> canvas) {
ui::CrushedSpriteResource::FrameSrcDstRects src_dst_rects =
resource->GetRectanglesForFrame(frame);
for (const auto& rect : src_dst_rects) {
« no previous file with comments | « chrome/browser/android/compositor/layer/crushed_sprite_layer.h ('k') | chrome/browser/android/compositor/layer_title_cache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698