SaveFlags be-gone

src/core/SkMatrixClipStateMgr.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkMatrixClipStateMgr_DEFINED
 #define SkMatrixClipStateMgr_DEFINED
 
 #include "SkCanvas.h"
@@ skipping 163 matching lines @@
 
                 // The CTM in effect when this clip call was issued
                 int          fMatrixID;
             };
 
             SkTDArray<ClipOp> fClips;
 
             typedef SkNoncopyable INHERITED;
         };
 
-        MatrixClipState(MatrixClipState* prev, int flags)
+        MatrixClipState(MatrixClipState* prev)
             : fPrev(prev)
         {
             fHasOpen = false;
 
             if (NULL == prev) {
                 fLayerID = 0;
 
                 fMatrixInfoStorage.reset();
                 fMatrixInfo = &fMatrixInfoStorage;
                 fClipInfo = &fClipInfoStorage;  // ctor handles init of fClipInfoStorage
 
                 // The identity/wide-open-clip state is current by default
                 fMCStateID = kIdentityWideOpenStateID;
 #ifdef SK_DEBUG
                 fExpectedDepth = 1;
 #endif
             }
             else {
                 fLayerID = prev->fLayerID;
 

[robertphillips, 2014/06/23 14:33:39]

Same here - I don't think we need the fMatrixInfo/fMatrixInfoStorage and
fClipInfo/fClipInfoStorage distinction.

-                if (flags & SkCanvas::kMatrix_SaveFlag) {
-                    fMatrixInfoStorage = *prev->fMatrixInfo;
-                    fMatrixInfo = &fMatrixInfoStorage;
-                } else {
-                    fMatrixInfo = prev->fMatrixInfo;
-                }
+                fMatrixInfoStorage = *prev->fMatrixInfo;
+                fMatrixInfo = &fMatrixInfoStorage;
 
-                if (flags & SkCanvas::kClip_SaveFlag) {
-                    // We don't copy the ClipOps of the previous clip states
-                    fClipInfo = &fClipInfoStorage;
-                } else {
-                    fClipInfo = prev->fClipInfo;
-                }
+                // We don't copy the ClipOps of the previous clip states
+                fClipInfo = &fClipInfoStorage;
 
                 // Initially a new save/saveLayer represents the same MC state
                 // as its predecessor.
                 fMCStateID = prev->fMCStateID;
 #ifdef SK_DEBUG
                 fExpectedDepth = prev->fExpectedDepth;
 #endif
             }
 
             fIsSaveLayer = false;
@@ skipping 40 matching lines @@
         fPicRecord = picRecord;
     }
 
     SkPictureRecord* getPicRecord() { return fPicRecord; }
 
     // TODO: need to override canvas' getSaveCount. Right now we pass the
     // save* and restore calls on to the base SkCanvas in SkPictureRecord but
     // this duplicates effort.
     int getSaveCount() const { return fMatrixClipStack.count(); }
 
-    int save(SkCanvas::SaveFlags flags);
+    int save();
 
     int saveLayer(const SkRect* bounds, const SkPaint* paint, SkCanvas::SaveFlags flags);
 
     bool isDrawingToLayer() const {
         return fCurMCState->fLayerID > 0;
     }
 
     void restore();
 
     void translate(SkScalar dx, SkScalar dy) {
@@ skipping 76 matching lines @@
     // The MCStateID of the state currently in effect in the byte stream. 0 if none.
     int32_t          fCurOpenStateID;
     // The skip offsets for the current open state. These are the locations in the
     // skp that must be filled in when the current open state is closed. These are
     // here rather then distributed across the MatrixClipState's because saveLayers
     // can cause MC states to be nested.
     SkTDArray<int32_t>  *fSkipOffsets;  // TODO: should we store u32 or size_t instead?
 
     SkDEBUGCODE(void validate();)
 
-    int MCStackPush(SkCanvas::SaveFlags flags);
+    int MCStackPush();
 
     void addClipOffset(size_t offset) {
         SkASSERT(NULL != fSkipOffsets);
         SkASSERT(kIdentityWideOpenStateID != fCurOpenStateID);
         SkASSERT(fCurMCState->fHasOpen);
         SkASSERT(!fCurMCState->fIsSaveLayer);
 
         *fSkipOffsets->append() = SkToS32(offset);
     }
 
@@ skipping 19 matching lines @@
 #ifdef SK_DEBUG
     int fActualDepth;
 #endif
 
     // save layers are nested within a specific MC state. This stack tracks
     // the nesting MC state's ID as save layers are pushed and popped.
     SkTDArray<int> fStateIDStack;
 };
 
 #endif