aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2017-07-28 16:02:46 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-07-28 20:51:23 +0000
commit94e0b1166e2f8636a58bed70825e34127de6e27c (patch)
treeb0bd24c5413d0892efa2776f703d52f6656b9641 /src
parent5af9ea399d5e0344cc4b7da4e97b5dc5b3c74f64 (diff)
Two small fixes from recent changes prepping for std::unique_ptr<GrFragmentProcessor>.
Change-Id: I5d58c7a1ef27095685215eef814df204e9beb63a Reviewed-on: https://skia-review.googlesource.com/28240 Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/effects/SkOverdrawColorFilter.cpp2
-rw-r--r--src/gpu/GrProcessorUnitTest.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/effects/SkOverdrawColorFilter.cpp b/src/effects/SkOverdrawColorFilter.cpp
index 1fcd14fe27..4eb9bfcaeb 100644
--- a/src/effects/SkOverdrawColorFilter.cpp
+++ b/src/effects/SkOverdrawColorFilter.cpp
@@ -122,7 +122,7 @@ sk_sp<GrFragmentProcessor> OverdrawFragmentProcessor::Make(const SkPMColor* colo
SkGetPackedA32(colors[i])));
}
- return sk_sp<OverdrawFragmentProcessor>(new OverdrawFragmentProcessor(grColors));
+ return sk_sp<GrFragmentProcessor>(new OverdrawFragmentProcessor(grColors));
}
// This could implement the constant input -> constant output optimization, but we don't really
diff --git a/src/gpu/GrProcessorUnitTest.h b/src/gpu/GrProcessorUnitTest.h
index 10ba9289ca..73a2cf3279 100644
--- a/src/gpu/GrProcessorUnitTest.h
+++ b/src/gpu/GrProcessorUnitTest.h
@@ -99,7 +99,7 @@ public:
static int Count() { return GetFactories()->count(); }
/** Use factory function at Index idx to create a processor. */
- static sk_sp<Processor> MakeIdx(int idx, GrProcessorTestData* data) {
+ static ProcessorSmartPtr MakeIdx(int idx, GrProcessorTestData* data) {
GrProcessorTestFactory<ProcessorSmartPtr>* factory = (*GetFactories())[idx];
ProcessorSmartPtr processor = factory->fMakeProc(data);
SkASSERT(processor);