aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrFragmentProcessor.cpp
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2017-07-31 16:27:23 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-07-31 20:51:42 +0000
commit96271cd1805d55b1a985652eebd0399ebe415283 (patch)
tree951bef0f222b0eb3c087901cd810f805593e5965 /src/gpu/GrFragmentProcessor.cpp
parentf3ce7e3c673fd4ace2ca56effe4cfd2908919b9d (diff)
Require clone() be implemented by GrFragmentProcessor subclasses
Change-Id: I66ba0978e5748806d563ff4f26000e4e0095ed24 Reviewed-on: https://skia-review.googlesource.com/29042 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrFragmentProcessor.cpp')
-rw-r--r--src/gpu/GrFragmentProcessor.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gpu/GrFragmentProcessor.cpp b/src/gpu/GrFragmentProcessor.cpp
index 8e795d5796..44b14add2d 100644
--- a/src/gpu/GrFragmentProcessor.cpp
+++ b/src/gpu/GrFragmentProcessor.cpp
@@ -305,8 +305,7 @@ sk_sp<GrFragmentProcessor> GrFragmentProcessor::MakeInputPremulAndMulByOutput(
const char* name() const override { return "Premultiply"; }
sk_sp<GrFragmentProcessor> clone() const override {
- auto child = this->childProcessor(0).clone();
- return child ? Make(std::move(child)) : nullptr;
+ return Make(this->childProcessor(0).clone());
}
private:
@@ -376,8 +375,7 @@ sk_sp<GrFragmentProcessor> GrFragmentProcessor::OverrideInput(sk_sp<GrFragmentPr
const char* name() const override { return "Replace Color"; }
sk_sp<GrFragmentProcessor> clone() const override {
- auto child = this->childProcessor(0).clone();
- return child ? Make(std::move(child), fColor) : nullptr;
+ return Make(this->childProcessor(0).clone(), fColor);
}
private: