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

Side by Side Diff: include/core/SkShader.h

Issue 1820303002: Revert of switch colorfilters to sk_sp (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 | « include/core/SkPaint.h ('k') | include/effects/SkBlurDrawLooper.h » ('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 #ifndef SkShader_DEFINED 8 #ifndef SkShader_DEFINED
9 #define SkShader_DEFINED 9 #define SkShader_DEFINED
10 10
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 /** 352 /**
353 * Return a shader that will apply the specified localMatrix to this shader . 353 * Return a shader that will apply the specified localMatrix to this shader .
354 * The specified matrix will be applied before any matrix associated with t his shader. 354 * The specified matrix will be applied before any matrix associated with t his shader.
355 */ 355 */
356 sk_sp<SkShader> makeWithLocalMatrix(const SkMatrix&) const; 356 sk_sp<SkShader> makeWithLocalMatrix(const SkMatrix&) const;
357 357
358 /** 358 /**
359 * Create a new shader that produces the same colors as invoking this shade r and then applying 359 * Create a new shader that produces the same colors as invoking this shade r and then applying
360 * the colorfilter. 360 * the colorfilter.
361 */ 361 */
362 sk_sp<SkShader> makeWithColorFilter(sk_sp<SkColorFilter>) const; 362 sk_sp<SkShader> makeWithColorFilter(SkColorFilter*) const;
363 363
364 ////////////////////////////////////////////////////////////////////////// 364 //////////////////////////////////////////////////////////////////////////
365 // Factory methods for stock shaders 365 // Factory methods for stock shaders
366 366
367 /** 367 /**
368 * Call this to create a new "empty" shader, that will not draw anything. 368 * Call this to create a new "empty" shader, that will not draw anything.
369 */ 369 */
370 static sk_sp<SkShader> MakeEmptyShader(); 370 static sk_sp<SkShader> MakeEmptyShader();
371 371
372 /** 372 /**
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 SkMatrix fLocalMatrix; 487 SkMatrix fLocalMatrix;
488 488
489 // So the SkLocalMatrixShader can whack fLocalMatrix in its SkReadBuffer con structor. 489 // So the SkLocalMatrixShader can whack fLocalMatrix in its SkReadBuffer con structor.
490 friend class SkLocalMatrixShader; 490 friend class SkLocalMatrixShader;
491 friend class SkBitmapProcShader; // for computeTotalInverse() 491 friend class SkBitmapProcShader; // for computeTotalInverse()
492 492
493 typedef SkFlattenable INHERITED; 493 typedef SkFlattenable INHERITED;
494 }; 494 };
495 495
496 #endif 496 #endif
OLDNEW
« no previous file with comments | « include/core/SkPaint.h ('k') | include/effects/SkBlurDrawLooper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698