diff options
author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-31 16:31:11 +0000 |
---|---|---|
committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-31 16:31:11 +0000 |
commit | 6fcbfcead5dc1b61fa5b4c139a1a3714e8c58091 (patch) | |
tree | c7bfb4b07deb28223c78af4de69e2440f34c3427 /src/utils/SkCanvasStateUtils.cpp | |
parent | 081560e3abe25c4821b79ca1465f4dbd371c4b5c (diff) |
Revert "add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning"
This reverts commit 1d22c4aaf9d8f053f25194a1ed74b137bfb19497.
git-svn-id: http://skia.googlecode.com/svn/trunk@12056 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/utils/SkCanvasStateUtils.cpp')
-rw-r--r-- | src/utils/SkCanvasStateUtils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/utils/SkCanvasStateUtils.cpp b/src/utils/SkCanvasStateUtils.cpp index 9c7d8fab3a..c62bc04e11 100644 --- a/src/utils/SkCanvasStateUtils.cpp +++ b/src/utils/SkCanvasStateUtils.cpp @@ -171,7 +171,7 @@ static void setup_MC_state(SkMCState* state, const SkMatrix& matrix, const SkReg } // allocate memory for the clip then and copy them to the struct - state->clipRects = (ClipRect*) sk_malloc_throw(clipWriter.bytesWritten()); + state->clipRects = (ClipRect*) sk_malloc_throw(clipWriter.size()); clipWriter.flatten(state->clipRects); } @@ -239,9 +239,9 @@ SkCanvasState* SkCanvasStateUtils::CaptureCanvasState(SkCanvas* canvas) { } // allocate memory for the layers and then and copy them to the struct - SkASSERT(layerWriter.bytesWritten() == layerCount * sizeof(SkCanvasLayerState)); + SkASSERT(layerWriter.size() == layerCount * sizeof(SkCanvasLayerState)); canvasState->layerCount = layerCount; - canvasState->layers = (SkCanvasLayerState*) sk_malloc_throw(layerWriter.bytesWritten()); + canvasState->layers = (SkCanvasLayerState*) sk_malloc_throw(layerWriter.size()); layerWriter.flatten(canvasState->layers); // for now, just ignore any client supplied DrawFilter. |