diff options
author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-31 17:28:30 +0000 |
---|---|---|
committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-31 17:28:30 +0000 |
commit | 4469938e92d779dff05e745559e67907bbf21e78 (patch) | |
tree | c87072ff8cef5709436279a1f771160511debd2a /src/utils/SkCanvasStateUtils.cpp | |
parent | 6fcbfcead5dc1b61fa5b4c139a1a3714e8c58091 (diff) |
Revert "Revert "add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning""
This reverts commit 1e787c38fa71f2a21fd728f1b1d620b9b09b0d3d.
BUG=
Review URL: https://codereview.chromium.org/54603004
git-svn-id: http://skia.googlecode.com/svn/trunk@12057 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 c62bc04e11..9c7d8fab3a 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.size()); + state->clipRects = (ClipRect*) sk_malloc_throw(clipWriter.bytesWritten()); 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.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. |