diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-06-13 09:01:36 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-13 18:07:58 +0000 |
| commit | f18c756360bde970c95a9ca5a47f8e6e12a6ba87 (patch) | |
| tree | 9d7c42ad6bb33f7c8279f39914a466773e9c8c1b /src | |
| parent | da86e2822ab31770e989009716dd4c89966ade45 (diff) | |
Pull non-substantive changes out of omnibus CL
https://skia-review.googlesource.com/c/skia/+/131500 (Move op memory
storage to GrContext) is still a bit of a monster. Offload the trivial
stuff.
Change-Id: I27eb0c441d08111491b3cfee3b93d260c26c2790
Reviewed-on: https://skia-review.googlesource.com/134501
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/GrPipeline.h | 2 | ||||
| -rw-r--r-- | src/gpu/GrProcessor.h | 3 | ||||
| -rw-r--r-- | src/shaders/SkPerlinNoiseShader.cpp | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h index 3862ab49c2..3ace0f0a1c 100644 --- a/src/gpu/GrPipeline.h +++ b/src/gpu/GrPipeline.h @@ -234,8 +234,6 @@ private: // This value is also the index in fFragmentProcessors where coverage processors begin. int fNumColorProcessors; - - typedef SkRefCnt INHERITED; }; #endif diff --git a/src/gpu/GrProcessor.h b/src/gpu/GrProcessor.h index c7704dbdf1..5d7fbd7a62 100644 --- a/src/gpu/GrProcessor.h +++ b/src/gpu/GrProcessor.h @@ -215,8 +215,7 @@ public: bool instantiate(GrResourceProvider* resourceProvider) const; protected: - GrResourceIOProcessor(ClassID classID) - : INHERITED(classID) {} + GrResourceIOProcessor(ClassID classID) : INHERITED(classID) {} /** * Subclasses call these from their constructor to register sampler sources. The processor diff --git a/src/shaders/SkPerlinNoiseShader.cpp b/src/shaders/SkPerlinNoiseShader.cpp index 2b4601bf43..4bc44a6eef 100644 --- a/src/shaders/SkPerlinNoiseShader.cpp +++ b/src/shaders/SkPerlinNoiseShader.cpp @@ -648,7 +648,7 @@ SkPMColor SkPerlinNoiseShaderImpl::PerlinNoiseShaderContext::shade( } SkShaderBase::Context* SkPerlinNoiseShaderImpl::onMakeContext(const ContextRec& rec, - SkArenaAlloc* alloc) const { + SkArenaAlloc* alloc) const { return alloc->make<PerlinNoiseShaderContext>(*this, rec); } |