third_party/WebKit/Source/platform/graphics/PicturePattern.cpp - Issue 1814473003: Revert of Add sk_sp helpers and switch Blink SkShader clients to the new APIs

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/PicturePattern.cpp

Issue 1814473003: Revert of Add sk_sp helpers and switch Blink SkShader clients to the new APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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

« no previous file with comments | « third_party/WebKit/Source/platform/graphics/PicturePattern.h ('k') | third_party/WebKit/Source/platform/graphics/paint/SkPictureBuilder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/PicturePattern.cpp

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

index ccda6c0819b16c0fc4ce027533da30b0b16ab8ac..728a27e84b67925f3b8bc508a5d6b03d9236d02f 100644

--- a/third_party/WebKit/Source/platform/graphics/PicturePattern.cpp

+++ b/third_party/WebKit/Source/platform/graphics/PicturePattern.cpp

@@ -10,13 +10,13 @@

namespace blink {

-PassRefPtr<PicturePattern> PicturePattern::create(PassRefPtr<SkPicture> picture,

+PassRefPtr<PicturePattern> PicturePattern::create(PassRefPtr<const SkPicture> picture,

RepeatMode repeatMode)

{

return adoptRef(new PicturePattern(picture, repeatMode));

}

-PicturePattern::PicturePattern(PassRefPtr<SkPicture> picture, RepeatMode mode)

+PicturePattern::PicturePattern(PassRefPtr<const SkPicture> picture, RepeatMode mode)

: Pattern(mode)

, m_tilePicture(picture)

{

@@ -35,7 +35,7 @@

SkMatrix localMatrix = affineTransformToSkMatrix(m_patternSpaceTransformation);

SkRect tileBounds = m_tilePicture->cullRect();

- return adoptRef(SkShader::MakePictureShader(adoptSkSp<SkPicture>(m_tilePicture),

+ return adoptRef(SkShader::CreatePictureShader(m_tilePicture.get(),

SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, &localMatrix, &tileBounds));

}