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

Unified Diff: third_party/WebKit/Source/platform/graphics/StaticBitmapImage.cpp

Issue 2290903002: Change (Pass)RefPtr<SkXxx> into sk_sp<SkXxx>. (Closed)
Patch Set: Rebasing... Created 4 years, 3 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: third_party/WebKit/Source/platform/graphics/StaticBitmapImage.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/StaticBitmapImage.cpp b/third_party/WebKit/Source/platform/graphics/StaticBitmapImage.cpp
index 8b3ac0036c07c034f4a559db768f7ffe65ad7fef..187f3271ae8884e4b2a71c1df85d57568b719c17 100644
--- a/third_party/WebKit/Source/platform/graphics/StaticBitmapImage.cpp
+++ b/third_party/WebKit/Source/platform/graphics/StaticBitmapImage.cpp
@@ -15,16 +15,16 @@
namespace blink {
-PassRefPtr<StaticBitmapImage> StaticBitmapImage::create(PassRefPtr<SkImage> image)
+PassRefPtr<StaticBitmapImage> StaticBitmapImage::create(sk_sp<SkImage> image)
{
if (!image)
return nullptr;
if (image->isTextureBacked())
- return AcceleratedStaticBitmapImage::create(image);
- return adoptRef(new StaticBitmapImage(image));
+ return AcceleratedStaticBitmapImage::create(std::move(image));
+ return adoptRef(new StaticBitmapImage(std::move(image)));
}
-StaticBitmapImage::StaticBitmapImage(PassRefPtr<SkImage> image) : m_image(image)
+StaticBitmapImage::StaticBitmapImage(sk_sp<SkImage> image) : m_image(std::move(image))
{
ASSERT(m_image);
}
@@ -60,7 +60,7 @@ void StaticBitmapImage::draw(SkCanvas* canvas, const SkPaint& paint, const Float
observer->didDraw(this);
}
-PassRefPtr<SkImage> StaticBitmapImage::imageForCurrentFrame()
+sk_sp<SkImage> StaticBitmapImage::imageForCurrentFrame()
{
return m_image;
}

Powered by Google App Engine
This is Rietveld 408576698