third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp - Issue 2290903002: Change (Pass)RefPtr<SkXxx> into sk_sp<SkXxx>.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp

Issue 2290903002: Change (Pass)RefPtr<SkXxx> into sk_sp<SkXxx>. (Closed)

Patch Set: Self-review. Created 4 years, 4 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

« third_party/WebKit/Source/platform/graphics/StaticBitmapImage.cpp ('K') | « third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp ('k') | third_party/WebKit/Source/platform/graphics/paint/DisplayItemListTest.cpp » ('j') | third_party/WebKit/Source/platform/graphics/skia/ImagePixelLocker.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp b/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp

index dd201db7ec2f7a9db99914a50233c31bbbe4735c..edb3cabd2fb6866346ab411cee176efdbd58021d 100644

--- a/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp

+++ b/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp

@@ -2132,7 +2132,7 @@ void WebGLImageConversion::ImageExtractor::extractImage(bool premultiplyAlpha, b

if (!m_image)

return;

- RefPtr<SkImage> skiaImage = m_image->imageForCurrentFrame();

+ sk_sp<SkImage> skiaImage = m_image->imageForCurrentFrame();

SkImageInfo info = skiaImage

? SkImageInfo::MakeN32Premul(m_image->width(), m_image->height())

: SkImageInfo::MakeUnknown();

@@ -2158,7 +2158,7 @@ void WebGLImageConversion::ImageExtractor::extractImage(bool premultiplyAlpha, b

// only immutable/fully decoded frames make it through. We could potentially relax this

// and allow SkImage::NewFromBitmap to make a copy.

ASSERT(bitmap.isImmutable());

- skiaImage = fromSkSp(SkImage::MakeFromBitmap(bitmap));

+ skiaImage = SkImage::MakeFromBitmap(bitmap);

info = bitmap.info();

if (hasAlpha && premultiplyAlpha)