Decrement SkCanvas::fDeferredSaveCount in doSave()

src/core/SkCanvas.cpp

 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
 #include "SkCanvasPriv.h"
 #include "SkBitmapDevice.h"
@@ skipping 783 matching lines @@
             } while ((layer = layer->fNext) != NULL);
         }
         fDeviceCMDirty = false;
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkCanvas::checkForDeferredSave() {
     if (fMCRec->fDeferredSaveCount > 0) {
-        fMCRec->fDeferredSaveCount -= 1;
         this->doSave();
     }
 }
 
 int SkCanvas::getSaveCount() const {
 #ifdef SK_DEBUG
     int count = 0;
     SkDeque::Iter iter(fMCStack, SkDeque::Iter::kFront_IterStart);
     for (;;) {
         const MCRec* rec = (const MCRec*)iter.next();
         if (!rec) {
             break;
         }
         count += 1 + rec->fDeferredSaveCount;
     }
     SkASSERT(count == fSaveCount);
 #endif
     return fSaveCount;
 }
 
 int SkCanvas::save() {
     fSaveCount += 1;
     fMCRec->fDeferredSaveCount += 1;
     return this->getSaveCount() - 1;  // return our prev value
 }
 
 void SkCanvas::doSave() {
     this->willSave();
+
+    SkASSERT(fMCRec->fDeferredSaveCount > 0);
+    fMCRec->fDeferredSaveCount -= 1;
     this->internalSave();
 }
 
 void SkCanvas::restore() {
     if (fMCRec->fDeferredSaveCount > 0) {
         SkASSERT(fSaveCount > 1);
         fSaveCount -= 1;
         fMCRec->fDeferredSaveCount -= 1;
     } else {
         // check for underflow
@@ skipping 1733 matching lines @@
     }
 
     if (matrix) {
         canvas->concat(*matrix);
     }
 }
 
 SkAutoCanvasMatrixPaint::~SkAutoCanvasMatrixPaint() {
     fCanvas->restoreToCount(fSaveCount);
 }