third_party/WebKit/Source/platform/graphics/Pattern.cpp - Issue 1789063005: 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/Pattern.cpp

Issue 1789063005: 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: fromSkSp, review comments 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

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

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

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

index ce773d59b50118c1770aa8b67cf971dfbafa1aa7..480b11582395cc0dd3d02db2dccb00b7f0d4b546 100644

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

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

@@ -29,6 +29,7 @@

#include "platform/graphics/ImagePattern.h"

#include "platform/graphics/PicturePattern.h"

+#include "platform/graphics/skia/SkiaUtils.h"

#include "third_party/skia/include/core/SkImage.h"

#include "third_party/skia/include/core/SkPicture.h"

#include "third_party/skia/include/core/SkShader.h"

@@ -41,7 +42,7 @@ PassRefPtr<Pattern> Pattern::createImagePattern(PassRefPtr<Image> tileImage, Rep

return ImagePattern::create(tileImage, repeatMode);

}

-PassRefPtr<Pattern> Pattern::createPicturePattern(PassRefPtr<const SkPicture> picture,

+PassRefPtr<Pattern> Pattern::createPicturePattern(PassRefPtr<SkPicture> picture,

RepeatMode repeatMode)

{

return PicturePattern::create(picture, repeatMode);

@@ -65,7 +66,7 @@ void Pattern::applyToPaint(SkPaint& paint)

m_pattern = createShader();

}

- paint.setShader(m_pattern.get());

+ paint.setShader(toSkSp(m_pattern));

}

void Pattern::setPatternSpaceTransform(const AffineTransform& patternSpaceTransformation)