Remove incremental draw optimization from SkDebugCanvas

src/utils/debugger/SkDebugCanvas.h

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SKDEBUGCANVAS_H_
@@ skipping 17 matching lines @@
 
     void setMegaVizMode(bool megaVizMode) { fMegaVizMode = megaVizMode; }
     bool getMegaVizMode() const { return fMegaVizMode; }
 
     /**
      * Enable or disable overdraw visualization
      */
     void setOverdrawViz(bool overdrawViz) { fOverdrawViz = overdrawViz; }
     bool getOverdrawViz() const { return fOverdrawViz; }
 
-    void setOutstandingSaveCount(int saveCount) { fOutstandingSaveCount = saveCount; }
-    int getOutstandingSaveCount() const { return fOutstandingSaveCount; }
-
     bool getAllowSimplifyClip() const { return fAllowSimplifyClip; }
 
     void setPicture(SkPicture* picture) { fPicture = picture; }
 
     /**
      * Enable or disable texure filtering override
      */
     void overrideTexFiltering(bool overrideTexFiltering, SkPaint::FilterLevel level);
 
     /**
@@ skipping 79 matching lines @@
     }
 
     /**
         Toggles the visibility / execution of the draw command at index i with
         the value of toggle.
      */
     void toggleCommand(int index, bool toggle);
 
     void setUserMatrix(SkMatrix matrix) {
         fUserMatrix = matrix;
-        fDrawNeedsReset = true;
     }
 
     SkString clipStackData() const { return fClipStackData; }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Inherited from SkCanvas
 ////////////////////////////////////////////////////////////////////////////////
 
     void beginCommentGroup(const char* description) SK_OVERRIDE;
     void addComment(const char* kywd, const char* value) SK_OVERRIDE;
@@ skipping 67 matching lines @@
 
     void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE;
 
     void markActiveCommands(int index);
 
 private:
     SkTDArray<SkDrawCommand*> fCommandVector;
     SkPicture* fPicture;
     bool fFilter;
     bool fMegaVizMode;
-    int fIndex;
     SkMatrix fUserMatrix;
-    bool     fDrawNeedsReset; // fUserMatrix has changed so the incremental draw won't work
     SkMatrix fMatrix;
     SkIRect fClip;
 
     SkString fClipStackData;
     bool fCalledAddStackData;
     SkPath fSaveDevPath;
 
     bool fOverdrawViz;
     SkDrawFilter* fOverdrawFilter;
 
     bool fOverrideTexFiltering;
     SkTexOverrideFilter* fTexOverrideFilter;
 
     /**
-        Number of unmatched save() calls at any point during a draw.
-        If there are any saveLayer() calls outstanding, we need to resolve
-        all of them, which in practice means resolving all save() calls,
-        to avoid corruption of our canvas.
-    */
-    int fOutstandingSaveCount;
-
-    /**
         The active saveLayer commands at a given point in the renderering.
         Only used when "mega" visualization is enabled.
     */
     SkTDArray<SkDrawCommand*> fActiveLayers;
 
     /**
         Adds the command to the classes vector of commands.
         @param command  The draw command for execution
      */
     void addDrawCommand(SkDrawCommand* command);
@@ skipping 20 matching lines @@
     bool lastClipStackData(const SkPath& devPath);
     void outputConicPoints(const SkPoint* pts, SkScalar weight);
     void outputPoints(const SkPoint* pts, int count);
     void outputPointsCommon(const SkPoint* pts, int count);
     void outputScalar(SkScalar num);
 
     typedef SkCanvas INHERITED;
 };
 
 #endif