third_party/WebKit/Source/platform/graphics/Pattern.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/Pattern.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/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 05a55dff2aded8bef7c91ae80232793f1ec46eb6..ce773d59b50118c1770aa8b67cf971dfbafa1aa7 100644

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

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

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

#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"

@@ -42,7 +41,7 @@

return ImagePattern::create(tileImage, repeatMode);

}

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

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

RepeatMode repeatMode)

{

return PicturePattern::create(picture, repeatMode);

@@ -66,7 +65,7 @@

m_pattern = createShader();

}

- paint.setShader(adoptSkSp<SkShader>(m_pattern));

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

}

void Pattern::setPatternSpaceTransform(const AffineTransform& patternSpaceTransformation)