Make GrProcessorDataManager a noop

TBR=bsalomon@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/1323963003

2 files changed, 5 insertions, 45 deletions

diff --git a/include/gpu/GrPaint.h b/include/gpu/GrPaint.h
index f8aaa0e04c..51a49210c6 100644
--- a/include/gpu/GrPaint.h
+++ b/include/gpu/GrPaint.h
@@ -136,7 +136,6 @@ public:
         }
 
         fXPFactory.reset(SkRef(paint.getXPFactory()));
-        fProcDataManager.reset(new GrProcessorDataManager(*paint.processorDataManager()));
 
         return *this;
     }
@@ -149,9 +148,9 @@ public:
      */
     bool isConstantBlendedColor(GrColor* constantColor) const;
 
-    GrProcessorDataManager* getProcessorDataManager() { return fProcDataManager.get(); }
+    GrProcessorDataManager* getProcessorDataManager() { return &fProcDataManager; }
 
-    const GrProcessorDataManager* processorDataManager() const { return fProcDataManager.get(); }
+    const GrProcessorDataManager* processorDataManager() const { return &fProcDataManager; }
 
 private:
     void resetFragmentProcessors() {
@@ -173,7 +172,7 @@ private:
     bool                                            fDither;
 
     GrColor                                         fColor;
-    SkAutoTUnref<GrProcessorDataManager>            fProcDataManager;
+    GrProcessorDataManager                          fProcDataManager;
 };
 
 #endif
diff --git a/include/gpu/GrProcessorDataManager.h b/include/gpu/GrProcessorDataManager.h
index ccc77d74eb..edec39f517 100644
--- a/include/gpu/GrProcessorDataManager.h
+++ b/include/gpu/GrProcessorDataManager.h
@@ -8,48 +8,9 @@
 #ifndef GrProcessorDataManager_DEFINED
 #define GrProcessorDataManager_DEFINED
 
-#include "SkRefCnt.h"
-#include "SkTArray.h"
+// TODO this class is just an empty stub for now
 
-class GrProcessorDataManager : public SkRefCnt {
-public:
-    GrProcessorDataManager() {}
-    GrProcessorDataManager(const GrProcessorDataManager& procDataManager) {
-        fIndices = procDataManager.fIndices;
-        fStorage = procDataManager.fStorage;
-    }
-
-    void* operator new(size_t size);
-    void operator delete(void* target);
-
-    void* operator new(size_t size, void* placement) {
-        return ::operator new(size, placement);
-    }
-    void operator delete(void* target, void* placement) {
-        ::operator delete(target, placement);
-    }
-
-private:
-    uint32_t currentSaveMarker() const { return 0; }
-    void restoreToSaveMarker(/*uint32_t marker*/) {}
-
-    // For GrPipelineBuilder::AutoRestoreProcessorDataManager
-    friend class GrPipelineBuilder;
-    static const uint32_t kNumProcessor = 1;
-    static const uint32_t kDataIndicesPerProcessor = 1;
-    static const uint32_t kPreAllocDataPerProcessor = 1;
-
-    /*static const size_t kPreAllocStorage = kNumProcessor * kPreAllocDataPerProcessor;
-    static const uint32_t kNumProcessor = 8;
-    static const uint32_t kDataIndicesPerProcessor = 4;
-    static const uint32_t kPreAllocDataPerProcessor = kDataIndicesPerProcessor *
-                                                      sizeof(GrCoordTransform);*/
-    static const size_t kPreAllocIndices = kNumProcessor * kDataIndicesPerProcessor;
-    static const size_t kPreAllocStorage = kNumProcessor * kPreAllocDataPerProcessor;
-    SkSTArray<kPreAllocIndices, uint32_t, true> fIndices;
-    SkSTArray<kPreAllocStorage, unsigned char, true> fStorage;
-
-    typedef SkRefCnt INHERITED;
+class GrProcessorDataManager {
 };
 
 #endif