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/ports | |
| 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/ports')
| -rw-r--r-- | src/ports/SkFontConfigInterface_direct.cpp | 2 | ||||
| -rw-r--r-- | src/ports/SkFontHost_FreeType.cpp | 1 | ||||
| -rw-r--r-- | src/ports/SkFontHost_mac.cpp | 1 | ||||
| -rw-r--r-- | src/ports/SkImageEncoder_WIC.cpp | 4 |
4 files changed, 3 insertions, 5 deletions
diff --git a/src/ports/SkFontConfigInterface_direct.cpp b/src/ports/SkFontConfigInterface_direct.cpp index c1a73e626c..df68fae0a8 100644 --- a/src/ports/SkFontConfigInterface_direct.cpp +++ b/src/ports/SkFontConfigInterface_direct.cpp @@ -7,7 +7,6 @@ /* migrated from chrome/src/skia/ext/SkFontHost_fontconfig_direct.cpp */ -#include "SkAutoMalloc.h" #include "SkBuffer.h" #include "SkDataTable.h" #include "SkFixed.h" @@ -20,6 +19,7 @@ #include "SkTDArray.h" #include "SkTemplates.h" #include "SkTypeface.h" +#include "SkTypes.h" #include <fontconfig/fontconfig.h> #include <unistd.h> diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index 47790f3644..15bc14d213 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -25,6 +25,7 @@ #include "SkStream.h" #include "SkString.h" #include "SkTemplates.h" +#include "SkTypes.h" #include <memory> #if defined(SK_CAN_USE_DLOPEN) diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index ce4895419f..274c9253a9 100644 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -20,7 +20,6 @@ #endif #include "SkAdvancedTypefaceMetrics.h" -#include "SkAutoMalloc.h" #include "SkCGUtils.h" #include "SkColorPriv.h" #include "SkDescriptor.h" diff --git a/src/ports/SkImageEncoder_WIC.cpp b/src/ports/SkImageEncoder_WIC.cpp index 6bc8b5473e..52f4599433 100644 --- a/src/ports/SkImageEncoder_WIC.cpp +++ b/src/ports/SkImageEncoder_WIC.cpp @@ -28,16 +28,14 @@ #undef INT64_MAX #undef UINT64_MAX +#include <wincodec.h> #include "SkAutoCoInitialize.h" -#include "SkAutoMalloc.h" #include "SkBitmap.h" #include "SkImageEncoderPriv.h" #include "SkIStream.h" -#include "SkImageEncoder.h" #include "SkStream.h" #include "SkTScopedComPtr.h" #include "SkUnPreMultiply.h" -#include <wincodec.h> //All Windows SDKs back to XPSP2 export the CLSID_WICImagingFactory symbol. //In the Windows8 SDK the CLSID_WICImagingFactory symbol is still exported |