Modify GrClipMaskManager to reflect logical constness

src/gpu/GrPipelineBuilder.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrPipelineBuilder_DEFINED
 #define GrPipelineBuilder_DEFINED
 
@@ skipping 92 matching lines @@
     void addCoverageTextureProcessor(GrTexture* texture,
                                      const SkMatrix& matrix,
                                      const GrTextureParams& params) {
         this->addCoverageProcessor(GrSimpleTextureEffect::Create(fProcDataManager, texture, matrix,
                                                                  params))->unref();
     }
 
     /**
      * When this object is destroyed it will remove any color/coverage FPs from the pipeline builder
      * that were added after its constructor.
      */

[robertphillips, 2015/07/10 17:25:45]

// This class can transiently modify its "const" GrPipelineBuilder object but
will restore it when done - so it is notionally "const" correct.
?

     class AutoRestoreFragmentProcessors : public ::SkNoncopyable {
     public:
         AutoRestoreFragmentProcessors() 
             : fPipelineBuilder(NULL)
             , fColorEffectCnt(0)
             , fCoverageEffectCnt(0) {}
 

[robertphillips, 2015/07/10 17:25:45]

Should this be const in solidarity ?

         AutoRestoreFragmentProcessors(GrPipelineBuilder* ds)
             : fPipelineBuilder(NULL)
             , fColorEffectCnt(0)
             , fCoverageEffectCnt(0) {
             this->set(ds);
         }
 
         ~AutoRestoreFragmentProcessors() { this->set(NULL); }
 
-        void set(GrPipelineBuilder* ds);
+        void set(const GrPipelineBuilder* ds);
 
         bool isSet() const { return SkToBool(fPipelineBuilder); }
 
+        const GrFragmentProcessor* addCoverageProcessor(const GrFragmentProcessor* processor) {
+            SkASSERT(this->isSet());
+            return fPipelineBuilder->addCoverageProcessor(processor);
+        }
+
     private:

[robertphillips, 2015/07/10 17:25:44]

// notionally const (as marginalia)
?

         GrPipelineBuilder*    fPipelineBuilder;
-        int             fColorEffectCnt;
-        int             fCoverageEffectCnt;
+        int                   fColorEffectCnt;
+        int                   fCoverageEffectCnt;
     };
 
     /// @}
 
     ///////////////////////////////////////////////////////////////////////////
     /// @name Blending
     ////
 
     /**
      * Returns true if this pipeline's color output will be affected by the existing render target
@@ skipping 91 matching lines @@
      * Shortcut to disable stencil testing and ops.
      */
     void disableStencil() { fStencilSettings.setDisabled(); }
 
     GrStencilSettings* stencil() { return &fStencilSettings; }
 
     /**
      * AutoRestoreStencil
      *
      * This simple struct saves and restores the stencil settings
      */

[robertphillips, 2015/07/10 17:25:45]

// This class can transiently modify its "const" GrPipelineBuilder object but
will restore it when done - so it is notionally "const" correct.
?

     class AutoRestoreStencil : public ::SkNoncopyable {
     public:
         AutoRestoreStencil() : fPipelineBuilder(NULL) {}
 
-        AutoRestoreStencil(GrPipelineBuilder* ds) : fPipelineBuilder(NULL) { this->set(ds); }
+        AutoRestoreStencil(const GrPipelineBuilder* ds) : fPipelineBuilder(NULL) { this->set(ds); }
 
         ~AutoRestoreStencil() { this->set(NULL); }
 
-        void set(GrPipelineBuilder* ds) {
+        void set(const GrPipelineBuilder* ds) {
             if (fPipelineBuilder) {
                 fPipelineBuilder->setStencil(fStencilSettings);
             }
-            fPipelineBuilder = ds;
+            fPipelineBuilder = const_cast<GrPipelineBuilder*>(ds);
             if (ds) {
                 fStencilSettings = ds->getStencil();
             }
         }
 
         bool isSet() const { return SkToBool(fPipelineBuilder); }
 
+        void setStencil(const GrStencilSettings& settings) {
+            SkASSERT(this->isSet());
+            fPipelineBuilder->setStencil(settings);
+        }
+
     private:

[robertphillips, 2015/07/10 17:25:45]

// notionally const (as marginalia)
?

         GrPipelineBuilder*  fPipelineBuilder;
         GrStencilSettings   fStencilSettings;
     };
 
 
     /// @}
 
     ///////////////////////////////////////////////////////////////////////////
     /// @name State Flags
     ////
@@ skipping 111 matching lines @@
         this->calcCoverageInvariantOutput(batch);
         return fCoverageProcInfo;
     }
 
     void setClip(const GrClip& clip) { fClip = clip; }
     const GrClip& clip() const { return fClip; }
 
     GrProcessorDataManager* getProcessorDataManager() { return fProcDataManager.get(); }
     const GrProcessorDataManager* processorDataManager() const { return fProcDataManager.get(); }
 
+    /**
+     * When this object is destroyed it will remove any additions to the GrProcessorDataManager
+     * owned by the GrPipelineBuilder

[robertphillips, 2015/07/10 17:25:44]

// This class can transiently modify its "const" GrPipelineBuilder object but
will restore it when done - so it is notionally "const" correct.
?

+     */
+    class AutoRestoreProcessorDataManager : public ::SkNoncopyable {
+    public:
+        AutoRestoreProcessorDataManager() : fPipelineBuilder(NULL), fSaveMarker(0) {}
+

[robertphillips, 2015/07/10 17:25:45]

const here ?

+        AutoRestoreProcessorDataManager(GrPipelineBuilder* ds)
+            : fPipelineBuilder(NULL)
+            , fSaveMarker(0) {
+            this->set(ds);
+        }
+
+        ~AutoRestoreProcessorDataManager() { this->set(NULL); }
+
+        void set(const GrPipelineBuilder* ds) {
+            if (fPipelineBuilder) {
+                fPipelineBuilder->getProcessorDataManager()->restoreSaveMarker(fSaveMarker);
+            }
+            fPipelineBuilder = const_cast<GrPipelineBuilder*>(ds);
+            if (ds) {
+                fSaveMarker = ds->processorDataManager()->currentSaveMarker();
+            }
+        }
+
+        bool isSet() const { return SkToBool(fPipelineBuilder); }
+
+        GrProcessorDataManager* getProcessorDataManager() {
+            SkASSERT(this->isSet());
+            return fPipelineBuilder->getProcessorDataManager();
+        }
+
+    private:

[robertphillips, 2015/07/10 17:25:44]

// notionally const (as marginalia)
?

+        GrPipelineBuilder* fPipelineBuilder;

[robertphillips, 2015/07/10 17:25:44]

line this guy up ?

+        uint32_t fSaveMarker;
+    };
+
+
 private:
     // Calculating invariant color / coverage information is expensive, so we partially cache the
     // results.
     //
     // canUseFracCoveragePrimProc() - Called in regular skia draw, caches results but only for a
     //                                specific color and coverage.  May be called multiple times
     // willColorBlendWithDst() - only called by Nvpr, does not cache results
     // GrOptDrawState constructor - never caches results
 
     /**
@@ skipping 16 matching lines @@
     void calcColorInvariantOutput(GrColor) const;
 
     /**
      * If fCoverageProcInfoValid is false, function calculates the invariant output for the coverage
      * processors and results are stored in fCoverageProcInfo.
      */
     void calcCoverageInvariantOutput(GrColor) const;
 
     // Some of the auto restore objects assume that no effects are removed during their lifetime.
     // This is used to assert that this condition holds.
-    SkDEBUGCODE(int fBlockEffectRemovalCnt;)
+    SkDEBUGCODE(mutable int fBlockEffectRemovalCnt;)
 
     typedef SkSTArray<4, GrFragmentStage> FragmentStageArray;
 
     SkAutoTUnref<GrProcessorDataManager>    fProcDataManager;
     SkAutoTUnref<GrRenderTarget>            fRenderTarget;
     uint32_t                                fFlags;
     GrStencilSettings                       fStencilSettings;
     DrawFace                                fDrawFace;
     mutable SkAutoTUnref<const GrXPFactory> fXPFactory;
     FragmentStageArray                      fColorStages;
     FragmentStageArray                      fCoverageStages;
     GrClip                                  fClip;
 
     mutable GrProcOptInfo fColorProcInfo;
     mutable GrProcOptInfo fCoverageProcInfo;
     mutable bool fColorProcInfoValid;
     mutable bool fCoverageProcInfoValid;
     mutable GrColor fColorCache;
     mutable GrColor fCoverageCache;
 
     friend class GrPipeline;
 };
 
 #endif