diff options
| author |  mtklein <mtklein@google.com> | 2016-03-10 11:31:27 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-10 11:31:27 -0800 |
| commit | 977c07dad26fbb56f6d4b5fc1ac1a324d28bd693 (patch) | |
| tree | 93016a3da1a43ada575ff1557716e97833f5a87d /src/ports | |
| parent | 7e6fcf890a1a63249136b8e6d9f4d5a606ef7508 (diff) | |
Revert of Use std::unique_ptr. (patchset #7 id:120001 of https://codereview.chromium.org/1780933003/ )
Reason for revert:
Now we remember! The problem was Clank:
https://build.chromium.org/p/tryserver.chromium.android/builders/android_clang_dbg_recipe/builds/34329
Original issue's description:
> Use std::unique_ptr.
>
> TBR=reed@google.com
>
> Committed: https://skia.googlesource.com/skia/+/20c1e3abfc681771f73eb19fde7284196e028940
TBR=bungeman@google.com,mtklein@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1782973002
Diffstat (limited to 'src/ports')
| -rw-r--r-- | src/ports/SkFontHost_FreeType.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index f01c7d7cc5..9230507662 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -25,7 +25,7 @@ #include "SkString.h" #include "SkTemplates.h" #include "SkTypes.h" -#include <memory> +#include "SkUniquePtr.h" #if defined(SK_CAN_USE_DLOPEN) #include <dlfcn.h> @@ -802,7 +802,7 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(SkTypeface* typeface, const S // load the font file using UnrefFTFace = SkFunctionWrapper<void, skstd::remove_pointer_t<FT_Face>, unref_ft_face>; - std::unique_ptr<skstd::remove_pointer_t<FT_Face>, UnrefFTFace> ftFace(ref_ft_face(typeface)); + skstd::unique_ptr<skstd::remove_pointer_t<FT_Face>, UnrefFTFace> ftFace(ref_ft_face(typeface)); if (nullptr == ftFace) { SkDEBUGF(("Could not create FT_Face.\n")); return; @@ -891,7 +891,7 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(SkTypeface* typeface, const S } using DoneFTSize = SkFunctionWrapper<FT_Error, skstd::remove_pointer_t<FT_Size>, FT_Done_Size>; - std::unique_ptr<skstd::remove_pointer_t<FT_Size>, DoneFTSize> ftSize([&ftFace]() -> FT_Size { + skstd::unique_ptr<skstd::remove_pointer_t<FT_Size>, DoneFTSize> ftSize([&ftFace]() -> FT_Size { FT_Size size; FT_Error err = FT_New_Size(ftFace.get(), &size); if (err != 0) { |