commit a499f905e9340e4935447f2562fd92e8853382b1
author reed <reed@google.com> Fri May 01 09:34:31 2015 -0700
committer Commit bot <commit-bot@chromium.org> Fri May 01 09:34:31 2015 -0700
tree 0e2bb276518bee77a9d55bd3bc167c4463a2841e
parent 3dc2ccae6c0f0cf6ac951585a197bfb8a58cfee5

clean up pre-storage in canvas

BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/1117213003

src/core/SkCanvas.cpp

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index c87c6c5..80e913d 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -530,9 +530,9 @@
     fMCRec = (MCRec*)fMCStack.push_back();
     new (fMCRec) MCRec(fConservativeRasterClip);
 
-    SkASSERT(sizeof(DeviceCM) <= sizeof(fBaseLayerStorage));
-    fMCRec->fLayer = (DeviceCM*)fBaseLayerStorage;
-    new (fBaseLayerStorage) DeviceCM(NULL, NULL, NULL, fConservativeRasterClip, false);
+    SkASSERT(sizeof(DeviceCM) <= sizeof(fDeviceCMStorage));
+    fMCRec->fLayer = (DeviceCM*)fDeviceCMStorage;
+    new (fDeviceCMStorage) DeviceCM(NULL, NULL, NULL, fConservativeRasterClip, false);
 
     fMCRec->fTopLayer = fMCRec->fLayer;
 
@@ -1106,7 +1106,7 @@
             SkDELETE(layer);
         } else {
             // we're at the root
-            SkASSERT(layer == (void*)fBaseLayerStorage);
+            SkASSERT(layer == (void*)fDeviceCMStorage);
             layer->~DeviceCM();
         }
     }