diff options
| author |  Matt Sarett <msarett@google.com> | 2017-04-25 13:53:11 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-25 18:24:47 +0000 |
| commit | c15bb7b10736e7b8f8d4bd0207c608546206ec1b (patch) | |
| tree | 423131b744b71389e17dab7a62d68e9d665397eb /src/core/SkColorSpaceXformer.h | |
| parent | 4785897c962c02dd6f92b37850dec527f34387f8 (diff) | |
Make SkColorSpaceXformer::apply(SkPaint) safe to call recursively
Before, we would stomp on the original paint in the recursive call.
This fixes 4 gbr-8888 gms. Currently, this only affects loopers
and SkPaintImageFilter.
Bug: skia:6516
Change-Id: Ic47d637a912370c0a1ae8ef3282ad7d15d9902e3
Reviewed-on: https://skia-review.googlesource.com/14182
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'src/core/SkColorSpaceXformer.h')
| -rw-r--r-- | src/core/SkColorSpaceXformer.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/SkColorSpaceXformer.h b/src/core/SkColorSpaceXformer.h index d357743d22..914e83932b 100644 --- a/src/core/SkColorSpaceXformer.h +++ b/src/core/SkColorSpaceXformer.h @@ -20,8 +20,7 @@ public: sk_sp<SkImage> apply(const SkBitmap& bitmap); sk_sp<SkColorFilter> apply(const SkColorFilter* filter); sk_sp<SkImageFilter> apply(const SkImageFilter* filter); - const SkPaint* apply(const SkPaint* src); - const SkPaint& apply(const SkPaint& src); + SkPaint apply(const SkPaint& src); void apply(SkColor dst[], const SkColor src[], int n); SkColor apply(SkColor srgb); @@ -32,7 +31,6 @@ private: sk_sp<SkColorSpace> fDst; std::unique_ptr<SkColorSpaceXform> fFromSRGB; - SkPaint fDstPaint; }; #endif |