AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Two small fixes from recent changes prepping for std::unique_ptr<GrFragmentProcessor>.

Browse Source 
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>
This commit is contained in:
Brian Salomon 2017-07-28 16:02:46 -04:00 committed by Skia Commit-Bot
parent 5af9ea399d
commit 94e0b1166e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/effects/SkOverdrawColorFilter.cpp
View File

@ -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

2
src/gpu/GrProcessorUnitTest.h
View File

@ -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);