Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(313)

Side by Side Diff: src/core/SkShader.cpp

Issue 1821103004: Revert of Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o… (Closed) Base URL: https://skia.googlesource.com/skia.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 unified diff | Download patch
« no previous file with comments | « src/core/SkReadBuffer.h ('k') | src/effects/SkBlurDrawLooper.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkAtomics.h" 8 #include "SkAtomics.h"
9 #include "SkBitmapProcShader.h" 9 #include "SkBitmapProcShader.h"
10 #include "SkColorShader.h" 10 #include "SkColorShader.h"
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 return MakeComposeShader(sk_ref_sp(dst), sk_ref_sp(src), mode).release(); 442 return MakeComposeShader(sk_ref_sp(dst), sk_ref_sp(src), mode).release();
443 } 443 }
444 SkShader* SkShader::CreateComposeShader(SkShader* dst, SkShader* src, SkXfermode * xfer) { 444 SkShader* SkShader::CreateComposeShader(SkShader* dst, SkShader* src, SkXfermode * xfer) {
445 return MakeComposeShader(sk_ref_sp(dst), sk_ref_sp(src), xfer).release(); 445 return MakeComposeShader(sk_ref_sp(dst), sk_ref_sp(src), xfer).release();
446 } 446 }
447 SkShader* SkShader::CreatePictureShader(const SkPicture* src, TileMode tmx, Tile Mode tmy, 447 SkShader* SkShader::CreatePictureShader(const SkPicture* src, TileMode tmx, Tile Mode tmy,
448 const SkMatrix* localMatrix, const SkRect* tile) { 448 const SkMatrix* localMatrix, const SkRect* tile) {
449 return MakePictureShader(sk_ref_sp(const_cast<SkPicture*>(src)), tmx, tmy, 449 return MakePictureShader(sk_ref_sp(const_cast<SkPicture*>(src)), tmx, tmy,
450 localMatrix, tile).release(); 450 localMatrix, tile).release();
451 } 451 }
452 SkShader* SkShader::newWithColorFilter(SkColorFilter* filter) const {
453 return this->makeWithColorFilter(sk_ref_sp(filter)).release();
454 }
455 #endif 452 #endif
OLDNEW
« no previous file with comments | « src/core/SkReadBuffer.h ('k') | src/effects/SkBlurDrawLooper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698