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

Unified Diff: third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.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/core/imagebitmap/ImageBitmapFactories.cpp
diff --git a/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp b/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp
index 980a5ed33be70cd3b0e02f0f35a4b2a1bf3de9f7..34159762db287618d818fecc11e11872691b254c 100644
--- a/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp
+++ b/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp
@@ -233,14 +233,14 @@ void ImageBitmapFactories::ImageBitmapLoader::decodeImageOnDecoderThread(WebTask
if (colorSpaceConversionOption == "none")
colorSpaceOp = ImageDecoder::GammaAndColorProfileIgnored;
std::unique_ptr<ImageDecoder> decoder(ImageDecoder::create(sharedBuffer.release(), true, alphaOp, colorSpaceOp));
- RefPtr<SkImage> frame;
+ sk_sp<SkImage> frame;
if (decoder) {
frame = ImageBitmap::getSkImageFromDecoder(std::move(decoder));
}
- taskRunner->postTask(BLINK_FROM_HERE, crossThreadBind(&ImageBitmapFactories::ImageBitmapLoader::resolvePromiseOnOriginalThread, wrapCrossThreadPersistent(this), frame.release()));
+ taskRunner->postTask(BLINK_FROM_HERE, crossThreadBind(&ImageBitmapFactories::ImageBitmapLoader::resolvePromiseOnOriginalThread, wrapCrossThreadPersistent(this), std::move(frame)));
}
-void ImageBitmapFactories::ImageBitmapLoader::resolvePromiseOnOriginalThread(PassRefPtr<SkImage> frame)
+void ImageBitmapFactories::ImageBitmapLoader::resolvePromiseOnOriginalThread(sk_sp<SkImage> frame)
{
if (!frame) {
rejectPromise();
@@ -248,7 +248,7 @@ void ImageBitmapFactories::ImageBitmapLoader::resolvePromiseOnOriginalThread(Pas
}
ASSERT(frame->width() && frame->height());
- RefPtr<StaticBitmapImage> image = StaticBitmapImage::create(frame);
+ RefPtr<StaticBitmapImage> image = StaticBitmapImage::create(std::move(frame));
image->setOriginClean(true);
ImageBitmap* imageBitmap = ImageBitmap::create(image, m_cropRect, m_options);
if (imageBitmap && imageBitmap->bitmapImage()) {

Powered by Google App Engine
This is Rietveld 408576698