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..1ac20a78b349cd42786f95d74139378fac66f139 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(image) |
f(malita)
2016/09/01 03:55:38
std::move(image)
Łukasz Anforowicz
2016/09/01 20:50:58
Done.
|
{ |
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; |
} |