Convert SkWriter32 to use an SkTDArray for its internal storage.

src/utils/SkCanvasStateUtils.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvasStateUtils.h"
 
 #include "SkBitmapDevice.h"
@@ skipping 137 matching lines @@
     }
 
     /*
      * capture the clip
      *
      * storage is allocated on the stack for the first 4 rects. This value was
      * chosen somewhat arbitrarily, but does allow us to represent simple clips
      * and some more common complex clips (e.g. a clipRect with a sub-rect
      * clipped out of its interior) without needing to malloc any additional memory.
      */
-    const int clipBufferSize = 4 * sizeof(ClipRect);
-    char clipBuffer[clipBufferSize];
-    SkWriter32 clipWriter(sizeof(ClipRect), clipBuffer, clipBufferSize);
+    SkSWriter32<4*sizeof(ClipRect)> clipWriter;
 
     if (!clip.isEmpty()) {
         // only returns the b/w clip so aa clips fail
         SkRegion::Iterator clip_iterator(clip);
         for (; !clip_iterator.done(); clip_iterator.next()) {
             // this assumes the SkIRect is stored in l,t,r,b ordering which
             // matches the ordering of our ClipRect struct
             clipWriter.writeIRect(clip_iterator.rect());
             state->clipRectCount++;
         }
@@ skipping 23 matching lines @@
     // decompose the total matrix and clip
     setup_MC_state(&canvasState->mcState, canvas->getTotalMatrix(), canvas->getTotalClip());
 
     /*
      * decompose the layers
      *
      * storage is allocated on the stack for the first 3 layers. It is common in
      * some view systems (e.g. Android) that a few non-clipped layers are present
      * and we will not need to malloc any additional memory in those cases.
      */
-    const int layerBufferSize = 3 * sizeof(SkCanvasLayerState);
-    char layerBuffer[layerBufferSize];
-    SkWriter32 layerWriter(sizeof(SkCanvasLayerState), layerBuffer, layerBufferSize);
+    SkSWriter32<3*sizeof(SkCanvasLayerState)> layerWriter;
     int layerCount = 0;
     for (SkCanvas::LayerIter layer(canvas, true/*skipEmptyClips*/); !layer.done(); layer.next()) {
 
         // we currently only work for bitmap backed devices
         const SkBitmap& bitmap = layer.device()->accessBitmap(true/*changePixels*/);
         if (bitmap.empty() || bitmap.isNull() || !bitmap.lockPixelsAreWritable()) {
             return NULL;
         }
 
         SkCanvasLayerState* layerState =
@@ skipping 117 matching lines @@
     }
 
     return canvas.detach();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 void SkCanvasStateUtils::ReleaseCanvasState(SkCanvasState* state) {
     SkDELETE(state);
 }