add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning

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 153 matching lines @@
         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++;
         }
     }
 
     // allocate memory for the clip then and copy them to the struct
-    state->clipRects = (ClipRect*) sk_malloc_throw(clipWriter.size());
+    state->clipRects = (ClipRect*) sk_malloc_throw(clipWriter.bytesWritten());
     clipWriter.flatten(state->clipRects);
 }
 
 
 
 SkCanvasState* SkCanvasStateUtils::CaptureCanvasState(SkCanvas* canvas) {
     SkASSERT(canvas);
 
     // Check the clip can be decomposed into rectangles (i.e. no soft clips).
     ClipValidator validator;
@@ skipping 47 matching lines @@
                 return NULL;
         }
         layerState->raster.rowBytes = bitmap.rowBytes();
         layerState->raster.pixels = bitmap.getPixels();
 
         setup_MC_state(&layerState->mcState, layer.matrix(), layer.clip());
         layerCount++;
     }
 
     // allocate memory for the layers and then and copy them to the struct
-    SkASSERT(layerWriter.size() == layerCount * sizeof(SkCanvasLayerState));
+    SkASSERT(layerWriter.bytesWritten() == layerCount * sizeof(SkCanvasLayerState));
     canvasState->layerCount = layerCount;
-    canvasState->layers = (SkCanvasLayerState*) sk_malloc_throw(layerWriter.size());
+    canvasState->layers = (SkCanvasLayerState*) sk_malloc_throw(layerWriter.bytesWritten());
     layerWriter.flatten(canvasState->layers);
 
     // for now, just ignore any client supplied DrawFilter.
     if (canvas->getDrawFilter()) {
 //        SkDEBUGF(("CaptureCanvasState will ignore the canvases draw filter.\n"));
     }
 
     return canvasState.detach();
 }
 
@@ skipping 79 matching lines @@
     }
 
     return canvas.detach();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 void SkCanvasStateUtils::ReleaseCanvasState(SkCanvasState* state) {
     SkDELETE(state);
 }