Use SkArenaAlloc instead of SkSmallAllocator in the SkAutoBlitterChoose code.

TBR=reed@google.com
Change-Id: Iefb044bf7657fbf982f23aa91a3f4d013ce2c626
Reviewed-on: https://skia-review.googlesource.com/7786
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Herb Derby <herb@google.com>

1 files changed, 2 insertions, 8 deletions

diff --git a/src/core/SkNormalMapSource.h b/src/core/SkNormalMapSource.h
index 5908369fc7..f2b07f21e9 100644
--- a/src/core/SkNormalMapSource.h
+++ b/src/core/SkNormalMapSource.h
@@ -21,8 +21,7 @@ public:
 #endif
 
     SkNormalSource::Provider* asProvider(const SkShader::ContextRec& rec,
-                                         void* storage) const override;
-    size_t providerSize(const SkShader::ContextRec& rec) const override;
+                                         SkArenaAlloc* alloc) const override;
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkNormalMapSourceImpl)
 
@@ -34,10 +33,7 @@ protected:
 private:
     class Provider : public SkNormalSource::Provider {
     public:
-        Provider(const SkNormalMapSourceImpl& source, SkShader::Context* mapContext,
-                 SkPaint* overridePaint);
-
-        virtual ~Provider() override;
+        Provider(const SkNormalMapSourceImpl& source, SkShader::Context* mapContext);
 
         void fillScanLine(int x, int y, SkPoint3 output[], int count) const override;
 
@@ -45,8 +41,6 @@ private:
         const SkNormalMapSourceImpl& fSource;
         SkShader::Context* fMapContext;
 
-        SkPaint* fOverridePaint;
-
         typedef SkNormalSource::Provider INHERITED;
     };