diff options
author | 2017-04-12 15:48:35 +0000 | |
---|---|---|
committer | 2017-04-12 15:48:41 +0000 | |
commit | a50a11c17ed9037d3e60d8319727583dba803cec (patch) | |
tree | c48b102047bb48db001a5c61e8e23521cd3205ba /src | |
parent | 5a8da16719da4e087f76dcb515ec15258d22cb67 (diff) |
Revert "SkColorSpaceXformer: Preserve local matrix on shaders"
This reverts commit 5d884b562828ceb13ccacb71bc4581d2020e62bb.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> SkColorSpaceXformer: Preserve local matrix on shaders
>
> Also, do not drop unknown shaders.
>
> Fixes cts tests.
>
> b/37161109
> b/37237678
>
> Bug: skia:
> Change-Id: I0fd817a4d6461ede0ccdcb8f3cccb255b646b864
> Reviewed-on: https://skia-review.googlesource.com/13246
> Commit-Queue: Matt Sarett <msarett@google.com>
> Commit-Queue: Mike Klein <mtklein@chromium.org>
> Reviewed-by: Mike Klein <mtklein@chromium.org>
>
TBR=mtklein@chromium.org,mtklein@google.com,msarett@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I34e02785ac43a04f8452c458680ea1d6518818a6
Reviewed-on: https://skia-review.googlesource.com/13258
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/SkColorSpaceXformer.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/SkColorSpaceXformer.cpp b/src/core/SkColorSpaceXformer.cpp index fe66e74c79..38e717de0d 100644 --- a/src/core/SkColorSpaceXformer.cpp +++ b/src/core/SkColorSpaceXformer.cpp @@ -71,8 +71,7 @@ SkColor SkColorSpaceXformer::apply(SkColor srgb) { sk_sp<SkShader> SkColorSpaceXformer::apply(const SkShader* shader) { SkColor color; if (shader->isConstant() && shader->asLuminanceColor(&color)) { - return SkShader::MakeColorShader(this->apply(color)) - ->makeWithLocalMatrix(shader->getLocalMatrix()); + return SkShader::MakeColorShader(this->apply(color)); } SkShader::TileMode xy[2]; @@ -86,8 +85,7 @@ sk_sp<SkShader> SkColorSpaceXformer::apply(const SkShader* shader) { auto A = this->apply(compose.fShaderA), B = this->apply(compose.fShaderB); if (A && B) { - return SkShader::MakeComposeShader(std::move(A), std::move(B), compose.fBlendMode) - ->makeWithLocalMatrix(shader->getLocalMatrix()); + return SkShader::MakeComposeShader(std::move(A), std::move(B), compose.fBlendMode); } } @@ -149,7 +147,7 @@ sk_sp<SkShader> SkColorSpaceXformer::apply(const SkShader* shader) { } } - return sk_ref_sp(const_cast<SkShader*>(shader)); + return nullptr; } const SkPaint& SkColorSpaceXformer::apply(const SkPaint& src) { |