third_party/WebKit/Source/core/svg/graphics/SVGImage.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/core/svg/graphics/SVGImage.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/core/layout/svg/LayoutSVGResourcePattern.cpp ('k') | third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

diff --git a/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp b/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

index 8eafef9ea1f40ded54248f13e26e673c7a811b9e..cfff39bdf3c995aacf7a0f325facf0fe58144ecb 100644

--- a/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

+++ b/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

@@ -286,14 +286,16 @@

SkPaint paint;

drawForContainer(patternPicture.context().canvas(), paint, containerSize, zoom, tile, srcRect, url);

}

- RefPtr<SkPicture> tilePicture = patternPicture.endRecording();

+ RefPtr<const SkPicture> tilePicture = patternPicture.endRecording();

SkMatrix patternTransform;

patternTransform.setTranslate(phase.x() + spacedTile.x(), phase.y() + spacedTile.y());

+ RefPtr<SkShader> patternShader = adoptRef(SkShader::CreatePictureShader(

+ tilePicture.get(), SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode,

+ &patternTransform, nullptr));

SkPaint paint;

- paint.setShader(SkShader::MakePictureShader(adoptSkSp(tilePicture.release()),

- SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, &patternTransform, nullptr));

+ paint.setShader(patternShader.get());

paint.setXfermodeMode(compositeOp);

paint.setColorFilter(context.colorFilter());

context.drawRect(dstRect, paint);