diff options
| author |  Kevin Lubick <kjlubick@google.com> | 2017-01-11 17:21:57 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-11 17:22:12 +0000 |
| commit | c456b73fef9589bbdc5eb83eaa83e53c357bb3da (patch) | |
| tree | bcb8f75efaf1523bc781fa592f56d7ff86598c32 /src/gpu/ops | |
| parent | bc6b99d22e8d9f6543ffffdc846e40e8075046c5 (diff) | |
Revert "SkTypes.h : move SkAutoMalloc into SkAutoMalloc.h"
This reverts commit a5494f117086d712855e4b6289c58c92d1549bcf.
Reason for revert: Broke Google3
Original change's description:
> SkTypes.h : move SkAutoMalloc into SkAutoMalloc.h
>
> * SkAutoFree moved to SkTemplates.h (now implmented with unique_ptr).
>
> * SkAutoMalloc and SkAutoSMalloc moved to SkAutoMalloc.h
>
> * "SkAutoFree X(sk_malloc_throw(N));" --> "SkAutoMalloc X(N);"
>
> Change-Id: Idacd86ca09e22bf092422228599ae0d9bedded88
> Reviewed-on: https://skia-review.googlesource.com/4543
> Reviewed-by: Ben Wagner <bungeman@google.com>
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Hal Canary <halcanary@google.com>
>
TBR=halcanary@google.com,bungeman@google.com,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ie8bd176121c3ee83c110d66c0d0ac65e09bfc9c5
Reviewed-on: https://skia-review.googlesource.com/6884
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Diffstat (limited to 'src/gpu/ops')
| -rw-r--r-- | src/gpu/ops/GrAADistanceFieldPathRenderer.cpp | 1 | ||||
| -rw-r--r-- | src/gpu/ops/GrMSAAPathRenderer.cpp | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/gpu/ops/GrAADistanceFieldPathRenderer.cpp b/src/gpu/ops/GrAADistanceFieldPathRenderer.cpp index 616b69f276..c9b30f5154 100644 --- a/src/gpu/ops/GrAADistanceFieldPathRenderer.cpp +++ b/src/gpu/ops/GrAADistanceFieldPathRenderer.cpp @@ -21,7 +21,6 @@ #include "ops/GrMeshDrawOp.h" #include "SkPathOps.h" -#include "SkAutoMalloc.h" #include "SkDistanceFieldGen.h" #include "GrDistanceFieldGenFromVector.h" diff --git a/src/gpu/ops/GrMSAAPathRenderer.cpp b/src/gpu/ops/GrMSAAPathRenderer.cpp index 53e4690eff..cc6781cac4 100644 --- a/src/gpu/ops/GrMSAAPathRenderer.cpp +++ b/src/gpu/ops/GrMSAAPathRenderer.cpp @@ -16,7 +16,6 @@ #include "GrPathStencilSettings.h" #include "GrPathUtils.h" #include "GrPipelineBuilder.h" -#include "SkAutoMalloc.h" #include "SkGeometry.h" #include "SkTraceEvent.h" #include "gl/GrGLVaryingHandler.h" @@ -347,7 +346,7 @@ private: MSAAQuadVertices quads; size_t quadVertexStride = sizeof(MSAAQuadVertices::Vertex); - SkAutoMalloc quadVertexPtr(fMaxQuadVertices * quadVertexStride); + SkAutoFree quadVertexPtr(sk_malloc_throw(fMaxQuadVertices * quadVertexStride)); quads.vertices = (MSAAQuadVertices::Vertex*) quadVertexPtr.get(); quads.nextVertex = quads.vertices; SkDEBUGCODE(quads.verticesEnd = quads.vertices + fMaxQuadVertices;) @@ -370,7 +369,7 @@ private: SkAutoFree quadIndexPtr; if (fIsIndexed) { quads.indices = (uint16_t*)sk_malloc_throw(3 * fMaxQuadVertices * sizeof(uint16_t)); - quadIndexPtr.reset(quads.indices); + quadIndexPtr.set(quads.indices); quads.nextIndex = quads.indices; } else { quads.indices = nullptr; |