use std::make_unique

Change-Id: I7c672ff6b8eb95ec8c1123a5bfdb202e1644f494 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/259281 Commit-Queue: Mike Klein <[email protected]> Reviewed-by: Ben Wagner <[email protected]>
rust-skia · Dec 12, 2019 · f46d5ca · f46d5ca
1 parent 1521e6b
commit f46d5ca
Show file tree

Hide file tree

Showing 103 changed files with 144 additions and 272 deletions.
diff --git a/bench/TypefaceBench.cpp b/bench/TypefaceBench.cpp
@@ -10,7 +10,6 @@
 #include "bench/Benchmark.h"
 #include "include/core/SkFont.h"
 #include "include/core/SkTypeface.h"
-#include "src/core/SkMakeUnique.h"
 #include "src/core/SkUtils.h"
 #include "src/utils/SkUTF.h"
 
@@ -255,7 +254,7 @@ class UtfToGlyph : public Benchmark {
     };
 
     std::unique_ptr<Line> convertLine(int lineIndex) {
-        std::unique_ptr<Line> result = skstd::make_unique<Line>();
+        std::unique_ptr<Line> result = std::make_unique<Line>();
 
         const char* cursor = fText[lineIndex];
         size_t len = strlen(cursor);

diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
@@ -32,7 +32,6 @@
 #include "src/codec/SkSwizzler.h"
 #include "src/core/SkAutoMalloc.h"
 #include "src/core/SkAutoPixmapStorage.h"
-#include "src/core/SkMakeUnique.h"
 #include "src/core/SkOSFile.h"
 #include "src/core/SkOpts.h"
 #include "src/core/SkPictureCommon.h"

diff --git a/gm/aaclip.cpp b/gm/aaclip.cpp
@@ -159,7 +159,6 @@ DEF_SIMPLE_GM(aaclip, canvas, 240, 120) {
 #ifdef SK_BUILD_FOR_MAC
 
 #include "include/utils/mac/SkCGUtils.h"
-#include "src/core/SkMakeUnique.h"
 
 static std::unique_ptr<SkCanvas> make_canvas(const SkBitmap& bm) {
     const SkImageInfo& info = bm.info();
@@ -168,7 +167,7 @@ static std::unique_ptr<SkCanvas> make_canvas(const SkBitmap& bm) {
                                              (SkPMColor*)bm.getPixels(),
                                              bm.rowBytes());
     } else {
-        return skstd::make_unique<SkCanvas>(bm);
+        return std::make_unique<SkCanvas>(bm);
     }
 }
 

diff --git a/gm/animated_gif.cpp b/gm/animated_gif.cpp
@@ -17,7 +17,6 @@
 #include "include/core/SkString.h"
 #include "include/core/SkTypes.h"
 #include "include/utils/SkAnimCodecPlayer.h"
-#include "src/core/SkMakeUnique.h"
 #include "src/core/SkOSFile.h"
 #include "tools/Resources.h"
 #include "tools/ToolUtils.h"
@@ -197,7 +196,7 @@ class AnimCodecPlayerGM : public skiagm::GM {
             completepath.printf("%s%s", root, path.c_str());
             auto codec = load_codec(completepath.c_str());
             if (codec) {
-                fPlayers.push_back(skstd::make_unique<SkAnimCodecPlayer>(std::move(codec)));
+                fPlayers.push_back(std::make_unique<SkAnimCodecPlayer>(std::move(codec)));
             }
         }
     }

diff --git a/gm/image_pict.cpp b/gm/image_pict.cpp
@@ -28,7 +28,6 @@
 #include "include/gpu/GrContext.h"
 #include "include/gpu/GrTypes.h"
 #include "include/private/GrTypesPriv.h"
-#include "src/core/SkMakeUnique.h"
 #include "src/gpu/GrContextPriv.h"
 #include "src/gpu/GrSamplerState.h"
 #include "src/gpu/GrSurfaceContext.h"
@@ -156,7 +155,7 @@ static std::unique_ptr<SkImageGenerator> make_ras_generator(GrContext*, sk_sp<Sk
     canvas.clear(0);
     canvas.translate(-100, -100);
     canvas.drawPicture(pic);
-    return skstd::make_unique<RasterGenerator>(bm);
+    return std::make_unique<RasterGenerator>(bm);
 }
 
 class EmptyGenerator : public SkImageGenerator {
@@ -212,9 +211,9 @@ static std::unique_ptr<SkImageGenerator> make_tex_generator(GrContext* ctx, sk_s
     const SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100);
 
     if (!ctx) {
-        return skstd::make_unique<EmptyGenerator>(info);
+        return std::make_unique<EmptyGenerator>(info);
     }
-    return skstd::make_unique<TextureGenerator>(ctx, info, pic);
+    return std::make_unique<TextureGenerator>(ctx, info, pic);
 }
 
 class ImageCacheratorGM : public skiagm::GM {

diff --git a/gm/imagemasksubset.cpp b/gm/imagemasksubset.cpp
@@ -17,7 +17,6 @@
 #include "include/core/SkSize.h"
 #include "include/core/SkSurface.h"
 #include "include/core/SkTypes.h"
-#include "src/core/SkMakeUnique.h"
 #include "tools/ToolUtils.h"
 
 namespace {
@@ -66,7 +65,7 @@ const MakerT makers[] = {
 
     // SkImage_Lazy
     [](SkCanvas*, const SkImageInfo& info) -> sk_sp<SkImage> {
-        return SkImage::MakeFromGenerator(skstd::make_unique<MaskGenerator>(info));
+        return SkImage::MakeFromGenerator(std::make_unique<MaskGenerator>(info));
     },
 };
 

diff --git a/gm/rasterhandleallocator.cpp b/gm/rasterhandleallocator.cpp
@@ -11,7 +11,6 @@
 #include "include/core/SkPixmap.h"
 #include "include/core/SkRasterHandleAllocator.h"
 #include "include/core/SkSurface.h"
-#include "src/core/SkMakeUnique.h"
 
 class GraphicsPort {
 protected:
@@ -298,7 +297,7 @@ DEF_SIMPLE_GM(rasterallocator, canvas, 600, 300) {
 
     const SkImageInfo info = SkImageInfo::MakeN32Premul(256, 256);
     std::unique_ptr<SkCanvas> nativeCanvas =
-        SkRasterHandleAllocator::MakeCanvas(skstd::make_unique<MyAllocator>(), info);
+        SkRasterHandleAllocator::MakeCanvas(std::make_unique<MyAllocator>(), info);
     MyPort nativePort(nativeCanvas.get());
     doDraw(&nativePort);
 

diff --git a/gn/core.gni b/gn/core.gni
@@ -241,7 +241,6 @@ skia_core_sources = [
   "$_src/core/SkLocalMatrixImageFilter.h",
   "$_src/core/SkMD5.cpp",
   "$_src/core/SkMD5.h",
-  "$_src/core/SkMakeUnique.h",
   "$_src/core/SkMalloc.cpp",
   "$_src/core/SkMallocPixelRef.cpp",
   "$_src/core/SkMask.cpp",

diff --git a/include/core/SkRasterHandleAllocator.h b/include/core/SkRasterHandleAllocator.h
@@ -24,7 +24,7 @@ class SkMatrix;
  *
  *      std::unique_ptr<SkCanvas> canvas = SkRasterHandleAllocator::MakeCanvas(
  *              SkImageInfo::Make(...),
- *              skstd::make_unique<MySubclassRasterHandleAllocator>(...),
+ *              std::make_unique<MySubclassRasterHandleAllocator>(...),
  *              nullptr);
  *
  *  If you have already allocated the base layer (and its handle, release-proc etc.) then you

diff --git a/modules/canvaskit/canvaskit_bindings.cpp b/modules/canvaskit/canvaskit_bindings.cpp
@@ -51,7 +51,6 @@
 #include "include/utils/SkShadowUtils.h"
 #include "modules/skshaper/include/SkShaper.h"
 #include "src/core/SkFontMgrPriv.h"
-#include "src/core/SkMakeUnique.h"
 #include "src/core/SkResourceCache.h"
 #include "src/shaders/SkRTShader.h"
 

diff --git a/modules/canvaskit/skottie_bindings.cpp b/modules/canvaskit/skottie_bindings.cpp
@@ -11,7 +11,6 @@
 #include "include/core/SkTypes.h"
 #include "modules/skottie/include/Skottie.h"
 #include "modules/sksg/include/SkSGInvalidationController.h"
-#include "src/core/SkMakeUnique.h"
 
 #include <string>
 #include <vector>
@@ -86,7 +85,7 @@ class ManagedAnimation final : public SkRefCnt {
 public:
     static sk_sp<ManagedAnimation> Make(const std::string& json,
                                         sk_sp<skottie::ResourceProvider> rp) {
-        auto mgr = skstd::make_unique<skottie_utils::CustomPropertyManager>();
+        auto mgr = std::make_unique<skottie_utils::CustomPropertyManager>();
         auto animation = skottie::Animation::Builder()
                             .setMarkerObserver(mgr->getMarkerObserver())
                             .setPropertyObserver(mgr->getPropertyObserver())

diff --git a/modules/particles/src/SkParticleEffect.cpp b/modules/particles/src/SkParticleEffect.cpp
@@ -12,7 +12,6 @@
 #include "modules/particles/include/SkParticleDrawable.h"
 #include "modules/particles/include/SkReflected.h"
 #include "modules/skresources/include/SkResources.h"
-#include "src/core/SkMakeUnique.h"
 #include "src/sksl/SkSLByteCode.h"
 #include "src/sksl/SkSLCompiler.h"
 
@@ -126,7 +125,7 @@ void SkParticleEffectParams::prepare(const skresources::ResourceProvider* resour
 
         SkTArray<std::unique_ptr<SkParticleExternalValue>> externalValues;
 
-        auto rand = skstd::make_unique<SkRandomExternalValue>("rand", compiler);
+        auto rand = std::make_unique<SkRandomExternalValue>("rand", compiler);
         compiler.registerExternalValue(rand.get());
         externalValues.push_back(std::move(rand));
 

diff --git a/modules/skottie/gm/SkottieGM.cpp b/modules/skottie/gm/SkottieGM.cpp
@@ -12,7 +12,6 @@
 #include "modules/skottie/include/SkottieProperty.h"
 #include "modules/skottie/utils/SkottieUtils.h"
 #include "modules/skresources/include/SkResources.h"
-#include "src/core/SkMakeUnique.h"
 #include "tools/Resources.h"
 
 #include <cmath>
@@ -102,7 +101,7 @@ class SkottieColorizeGM : public skiagm::GM {
 
     void onOnceBeforeDraw() override {
         if (auto stream = GetResourceAsStream("skottie/skottie_sample_search.json")) {
-            fPropManager = skstd::make_unique<skottie_utils::CustomPropertyManager>();
+            fPropManager = std::make_unique<skottie_utils::CustomPropertyManager>();
             fAnimation   = skottie::Animation::Builder()
                               .setPropertyObserver(fPropManager->getPropertyObserver())
                               .make(stream.get());

diff --git a/modules/skottie/src/SkottieTool.cpp b/modules/skottie/src/SkottieTool.cpp
@@ -13,7 +13,6 @@
 #include "include/encode/SkPngEncoder.h"
 #include "modules/skottie/include/Skottie.h"
 #include "modules/skresources/include/SkResources.h"
-#include "src/core/SkMakeUnique.h"
 #include "src/core/SkOSFile.h"
 #include "src/core/SkTaskGroup.h"
 #include "src/utils/SkOSPath.h"
@@ -48,7 +47,7 @@ namespace {
 
 std::unique_ptr<SkFILEWStream> MakeFrameStream(size_t idx, const char* ext) {
     const auto frame_file = SkStringPrintf("0%06d.%s", idx, ext);
-    auto stream = skstd::make_unique<SkFILEWStream>(SkOSPath::Join(FLAGS_writePath[0],
+    auto stream = std::make_unique<SkFILEWStream>(SkOSPath::Join(FLAGS_writePath[0],
                                                                    frame_file.c_str()).c_str());
     if (!stream->isValid()) {
         return nullptr;
@@ -235,7 +234,7 @@ std::unique_ptr<Sink> MakeSink(const char* fmt, const SkMatrix& scale_matrix) {
     if (0 == strcmp(fmt,  "png")) return  PNGSink::Make(scale_matrix);
     if (0 == strcmp(fmt,  "skp")) return  SKPSink::Make(scale_matrix);
     if (0 == strcmp(fmt, "null")) return NullSink::Make(scale_matrix);
-    if (0 == strcmp(fmt,  "mp4")) return skstd::make_unique<MP4Sink>(scale_matrix);
+    if (0 == strcmp(fmt,  "mp4")) return std::make_unique<MP4Sink>(scale_matrix);
 
     SkDebugf("Unknown format: %s\n", FLAGS_format[0]);
     return nullptr;

diff --git a/modules/skparagraph/src/ParagraphBuilderImpl.cpp b/modules/skparagraph/src/ParagraphBuilderImpl.cpp
@@ -3,7 +3,6 @@
 #include "modules/skparagraph/include/ParagraphStyle.h"
 #include "modules/skparagraph/src/ParagraphBuilderImpl.h"
 #include "modules/skparagraph/src/ParagraphImpl.h"
-#include "src/core/SkMakeUnique.h"
 #include "src/core/SkSpan.h"
 #include "unicode/unistr.h"
 
@@ -12,7 +11,7 @@ namespace textlayout {
 
 std::unique_ptr<ParagraphBuilder> ParagraphBuilder::make(
         const ParagraphStyle& style, sk_sp<FontCollection> fontCollection) {
-    return skstd::make_unique<ParagraphBuilderImpl>(style, fontCollection);
+    return std::make_unique<ParagraphBuilderImpl>(style, fontCollection);
 }
 
 ParagraphBuilderImpl::ParagraphBuilderImpl(
@@ -146,7 +145,7 @@ std::unique_ptr<Paragraph> ParagraphBuilderImpl::Build() {
 
     // Add one fake placeholder with the rest of the text
     addPlaceholder(PlaceholderStyle(), true);
-    return skstd::make_unique<ParagraphImpl>(
+    return std::make_unique<ParagraphImpl>(
             fUtf8, fParagraphStyle, fStyledBlocks, fPlaceholders, fFontCollection);
 }
 

diff --git a/modules/skparagraph/src/TextLine.cpp b/modules/skparagraph/src/TextLine.cpp
@@ -7,7 +7,6 @@
 #include "include/core/SkMaskFilter.h"
 #include "include/effects/SkDashPathEffect.h"
 #include "include/effects/SkDiscretePathEffect.h"
-#include "src/core/SkMakeUnique.h"
 
 namespace skia {
 namespace textlayout {

diff --git a/modules/skresources/src/SkResources.cpp b/modules/skresources/src/SkResources.cpp
@@ -12,7 +12,6 @@
 #include "include/core/SkImage.h"
 #include "include/utils/SkAnimCodecPlayer.h"
 #include "include/utils/SkBase64.h"
-#include "src/core/SkMakeUnique.h"
 #include "src/core/SkOSFile.h"
 #include "src/utils/SkOSPath.h"
 
@@ -21,7 +20,7 @@ namespace skresources {
 sk_sp<MultiFrameImageAsset> MultiFrameImageAsset::Make(sk_sp<SkData> data, bool predecode) {
     if (auto codec = SkCodec::MakeFromData(std::move(data))) {
         return sk_sp<MultiFrameImageAsset>(
-              new MultiFrameImageAsset(skstd::make_unique<SkAnimCodecPlayer>(std::move(codec)),
+              new MultiFrameImageAsset(std::make_unique<SkAnimCodecPlayer>(std::move(codec)),
                                                                              predecode));
     }
 

diff --git a/modules/sksg/src/SkSGRenderEffect.cpp b/modules/sksg/src/SkSGRenderEffect.cpp
@@ -10,7 +10,6 @@
 #include "include/core/SkCanvas.h"
 #include "include/core/SkMaskFilter.h"
 #include "include/core/SkShader.h"
-#include "src/core/SkMakeUnique.h"
 #include "src/core/SkMaskFilterBase.h"
 
 namespace sksg {
@@ -178,7 +177,7 @@ void ImageFilterEffect::onRender(SkCanvas* canvas, const RenderContext* ctx) con
 }
 
 ImageFilter::ImageFilter(sk_sp<ImageFilter> input)
-    : ImageFilter(input ? skstd::make_unique<InputsT>(1, std::move(input)) : nullptr) {}
+    : ImageFilter(input ? std::make_unique<InputsT>(1, std::move(input)) : nullptr) {}
 
 ImageFilter::ImageFilter(std::unique_ptr<InputsT> inputs)
     : INHERITED(kBubbleDamage_Trait)

diff --git a/modules/skshaper/src/SkShaper.cpp b/modules/skshaper/src/SkShaper.cpp
@@ -13,7 +13,6 @@
 #include "include/core/SkTypeface.h"
 #include "include/private/SkTFitsIn.h"
 #include "modules/skshaper/include/SkShaper.h"
-#include "src/core/SkMakeUnique.h"
 #include "src/core/SkTextBlobPriv.h"
 #include "src/utils/SkUTF.h"
 
@@ -42,7 +41,7 @@ SkShaper::MakeBiDiRunIterator(const char* utf8, size_t utf8Bytes, uint8_t bidiLe
         return bidi;
     }
 #endif
-    return skstd::make_unique<SkShaper::TrivialBiDiRunIterator>(bidiLevel, utf8Bytes);
+    return std::make_unique<SkShaper::TrivialBiDiRunIterator>(bidiLevel, utf8Bytes);
 }
 
 std::unique_ptr<SkShaper::ScriptRunIterator>
@@ -54,7 +53,7 @@ SkShaper::MakeScriptRunIterator(const char* utf8, size_t utf8Bytes, SkFourByteTa
         return script;
     }
 #endif
-    return skstd::make_unique<SkShaper::TrivialScriptRunIterator>(scriptTag, utf8Bytes);
+    return std::make_unique<SkShaper::TrivialScriptRunIterator>(scriptTag, utf8Bytes);
 }
 
 SkShaper::SkShaper() {}
@@ -165,7 +164,7 @@ std::unique_ptr<SkShaper::FontRunIterator>
 SkShaper::MakeFontMgrRunIterator(const char* utf8, size_t utf8Bytes,
                                  const SkFont& font, sk_sp<SkFontMgr> fallback)
 {
-    return skstd::make_unique<FontMgrRunIterator>(utf8, utf8Bytes, font, std::move(fallback));
+    return std::make_unique<FontMgrRunIterator>(utf8, utf8Bytes, font, std::move(fallback));
 }
 
 std::unique_ptr<SkShaper::FontRunIterator>
@@ -174,13 +173,13 @@ SkShaper::MakeFontMgrRunIterator(const char* utf8, size_t utf8Bytes, const SkFon
                                  const char* requestName, SkFontStyle requestStyle,
                                  const SkShaper::LanguageRunIterator* language)
 {
-    return skstd::make_unique<FontMgrRunIterator>(utf8, utf8Bytes, font, std::move(fallback),
+    return std::make_unique<FontMgrRunIterator>(utf8, utf8Bytes, font, std::move(fallback),
                                                   requestName, requestStyle, language);
 }
 
 std::unique_ptr<SkShaper::LanguageRunIterator>
 SkShaper::MakeStdLanguageRunIterator(const char* utf8, size_t utf8Bytes) {
-    return skstd::make_unique<TrivialLanguageRunIterator>(std::locale().name().c_str(), utf8Bytes);
+    return std::make_unique<TrivialLanguageRunIterator>(std::locale().name().c_str(), utf8Bytes);
 }
 
 void SkTextBlobBuilderRunHandler::beginLine() {

diff --git a/modules/skshaper/src/SkShaper_harfbuzz.cpp b/modules/skshaper/src/SkShaper_harfbuzz.cpp
@@ -25,7 +25,6 @@
 #include "include/private/SkTemplates.h"
 #include "include/private/SkTo.h"
 #include "modules/skshaper/include/SkShaper.h"
-#include "src/core/SkMakeUnique.h"
 #include "src/core/SkSpan.h"
 #include "src/core/SkTDPQueue.h"
 #include "src/utils/SkUTF.h"
@@ -762,12 +761,12 @@ static std::unique_ptr<SkShaper> MakeHarfBuzz(sk_sp<SkFontMgr> fontmgr, bool cor
     }
 
     if (correct) {
-        return skstd::make_unique<ShaperDrivenWrapper>(std::move(buffer),
+        return std::make_unique<ShaperDrivenWrapper>(std::move(buffer),
                                                        std::move(lineBreakIterator),
                                                        std::move(graphemeBreakIterator),
                                                        std::move(fontmgr));
     } else {
-        return skstd::make_unique<ShapeThenWrap>(std::move(buffer),
+        return std::make_unique<ShapeThenWrap>(std::move(buffer),
                                                  std::move(lineBreakIterator),
                                                  std::move(graphemeBreakIterator),
                                                  std::move(fontmgr));
@@ -1432,12 +1431,12 @@ SkShaper::MakeIcuBiDiRunIterator(const char* utf8, size_t utf8Bytes, uint8_t bid
         return nullptr;
     }
 
-    return skstd::make_unique<IcuBiDiRunIterator>(utf8, utf8 + utf8Bytes, std::move(bidi));
+    return std::make_unique<IcuBiDiRunIterator>(utf8, utf8 + utf8Bytes, std::move(bidi));
 }
 
 std::unique_ptr<SkShaper::ScriptRunIterator>
 SkShaper::MakeHbIcuScriptRunIterator(const char* utf8, size_t utf8Bytes) {
-    return skstd::make_unique<HbIcuScriptRunIterator>(utf8, utf8Bytes);
+    return std::make_unique<HbIcuScriptRunIterator>(utf8, utf8Bytes);
 }
 
 std::unique_ptr<SkShaper> SkShaper::MakeShaperDrivenWrapper(sk_sp<SkFontMgr> fontmgr) {
@@ -1459,6 +1458,6 @@ std::unique_ptr<SkShaper> SkShaper::MakeShapeDontWrapOrReorder(sk_sp<SkFontMgr>
         return nullptr;
     }
 
-    return skstd::make_unique<ShapeDontWrapOrReorder>(std::move(buffer), nullptr, nullptr,
+    return std::make_unique<ShapeDontWrapOrReorder>(std::move(buffer), nullptr, nullptr,
                                                       std::move(fontmgr));
 }