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/core/SkScan_AAAPath.cpp | |
| 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/core/SkScan_AAAPath.cpp')
| -rw-r--r-- | src/core/SkScan_AAAPath.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/SkScan_AAAPath.cpp b/src/core/SkScan_AAAPath.cpp index 8c0a748bdf..f96e7b9bb8 100644 --- a/src/core/SkScan_AAAPath.cpp +++ b/src/core/SkScan_AAAPath.cpp @@ -5,11 +5,10 @@ * found in the LICENSE file. */ -#include "SkAnalyticEdge.h" #include "SkAntiRun.h" -#include "SkAutoMalloc.h" #include "SkBlitter.h" #include "SkEdge.h" +#include "SkAnalyticEdge.h" #include "SkEdgeBuilder.h" #include "SkGeometry.h" #include "SkPath.h" @@ -18,8 +17,8 @@ #include "SkRegion.h" #include "SkScan.h" #include "SkScanPriv.h" -#include "SkTSort.h" #include "SkTemplates.h" +#include "SkTSort.h" #include "SkUtils.h" /////////////////////////////////////////////////////////////////////////////// |