commit f46d5ca49221113497d41e8f2a3c0c59151f4010
author Mike Klein <mtklein@google.com> Wed Dec 11 10:45:01 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Dec 12 22:32:45 2019 +0000
tree bc661149a330e1e5e8e20944342d1147dbbc5048
parent 1521e6b24c19f30eda383bb00b26862894ae9182

use std::make_unique

Change-Id: I7c672ff6b8eb95ec8c1123a5bfdb202e1644f494
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/259281
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

samplecode/SampleCCPRGeometry.cpp

diff --git a/samplecode/SampleCCPRGeometry.cpp b/samplecode/SampleCCPRGeometry.cpp
index dff8ed9..fe3b280 100644
--- a/samplecode/SampleCCPRGeometry.cpp
+++ b/samplecode/SampleCCPRGeometry.cpp
@@ -13,7 +13,6 @@
 #include "include/core/SkPaint.h"
 #include "include/core/SkPath.h"
 #include "samplecode/Sample.h"
-#include "src/core/SkMakeUnique.h"
 #include "src/core/SkRectPriv.h"
 #include "src/gpu/GrClip.h"
 #include "src/gpu/GrContextPriv.h"
@@ -112,7 +111,7 @@
         return "[Testing/Sample code] CCPRGeometryView::VisualizeCoverageCountFP";
     }
     std::unique_ptr<GrFragmentProcessor> clone() const override {
-        return skstd::make_unique<VisualizeCoverageCountFP>();
+        return std::make_unique<VisualizeCoverageCountFP>();
     }
     void onGetGLSLProcessorKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override {}
     bool onIsEqual(const GrFragmentProcessor&) const override { return true; }
@@ -198,7 +197,7 @@
                 GrSimpleTextureEffect::Make(sk_ref_sp(ccbuff->asTextureProxy()),
                                             ccbuff->colorInfo().alphaType(), SkMatrix::I()));
         paint.addColorFragmentProcessor(
-                skstd::make_unique<VisualizeCoverageCountFP>());
+                std::make_unique<VisualizeCoverageCountFP>());
         paint.setPorterDuffXPFactory(SkBlendMode::kSrcOver);
         rtc->drawRect(GrNoClip(), std::move(paint), GrAA::kNo, SkMatrix::I(),
                       SkRect::MakeIWH(this->width(), this->height()));
@@ -340,9 +339,9 @@
 
     std::unique_ptr<GrCCCoverageProcessor> proc;
     if (state->caps().shaderCaps()->geometryShaderSupport()) {
-        proc = skstd::make_unique<GrGSCoverageProcessor>();
+        proc = std::make_unique<GrGSCoverageProcessor>();
     } else {
-        proc = skstd::make_unique<GrVSCoverageProcessor>();
+        proc = std::make_unique<GrVSCoverageProcessor>();
     }
 
     if (!fView->fDoStroke) {