Fix saveLayer bugs in SkMatrixClipStateMgr

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 162 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)
-#ifdef SK_DEBUG
             : fPrev(prev)
-#endif
         {
+            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;
 
                 if (flags & SkCanvas::kMatrix_SaveFlag) {
                     fMatrixInfoStorage = *prev->fMatrixInfo;
                     fMatrixInfo = &fMatrixInfoStorage;
                 } else {
                     fMatrixInfo = prev->fMatrixInfo;
                 }
 
                 if (flags & SkCanvas::kClip_SaveFlag) {
                     // We don't copy the ClipOps of the previous clip states
                     fClipInfo = &fClipInfoStorage;
                 } else {
                     fClipInfo = prev->fClipInfo;
                 }
 
                 // 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;
         }
 
         MatrixInfo*  fMatrixInfo;
         MatrixInfo   fMatrixInfoStorage;
 
         ClipInfo*    fClipInfo;
         ClipInfo     fClipInfoStorage;
 
         // Tracks the current depth of saveLayers to support the isDrawingToLayer call
         int          fLayerID;
         // Does this MC state represent a saveLayer call?
         bool         fIsSaveLayer;
 
         // The next two fields are only valid when fIsSaveLayer is set.
         int32_t      fSaveLayerBaseStateID;
         SkTDArray<int>* fSavedSkipOffsets;
 
+        // Does the MC state have an open block in the skp?
+        bool         fHasOpen;
+
+        MatrixClipState* fPrev; 
+
 #ifdef SK_DEBUG
-        MatrixClipState* fPrev; // debugging aid
+        int              fExpectedDepth;    // debugging aid
 #endif
 
         int32_t     fMCStateID;
     };
 
     enum CallType {
         kMatrix_CallType,
         kClip_CallType,
         kOther_CallType
     };
@@ skipping 109 matching lines @@
     // can cause MC states to be nested.
     SkTDArray<int32_t>  *fSkipOffsets;
 
     SkDEBUGCODE(void validate();)
 
     int MCStackPush(SkCanvas::SaveFlags flags);
 
     void addClipOffset(int offset) {
         SkASSERT(NULL != fSkipOffsets);
         SkASSERT(kIdentityWideOpenStateID != fCurOpenStateID);
+        SkASSERT(fCurMCState->fHasOpen);
+        SkASSERT(!fCurMCState->fIsSaveLayer);
 
         *fSkipOffsets->append() = offset;
     }
 
     void writeDeltaMat(int currentMatID, int desiredMatID);
     static int32_t   NewMCStateID();
 
     int addRegionToDict(const SkRegion& region);
     const SkRegion* lookupRegion(int index) {
         SkASSERT(index >= 0 && index < fRegionDict.count());
         return fRegionDict[index];
     }
 
     // TODO: add stats to check if the dictionary really does
     // reduce the size of the SkPicture.
     int addMatToDict(const SkMatrix& mat);
     const SkMatrix& lookupMat(int index) {
         SkASSERT(index >= 0 && index < fMatrixDict.count());
         return fMatrixDict[index];
     }
+
+    bool isCurrentlyOpen(int32_t stateID);
+
+#ifdef SK_DEBUG
+    int fActualDepth;
+#endif
 };
 
 #endif