how to use SkArenaAlloc with no friends

Mike Klein · Skia Commit-Bot · commit f124108e2325 · 2020-12-15T01:23:18.000Z
No more friend class ::SkArenaAlloc; // for access to ctor Change-Id: I76fa3319498a965623e6865b75d1fb507ab845a6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/344236 Auto-Submit: Mike Klein <mtklein@google.com> Commit-Queue: Herb Derby <herb@google.com> Reviewed-by: Herb Derby <herb@google.com>
diff --git a/bench/VertexColorSpaceBench.cpp b/bench/VertexColorSpaceBench.cpp
@@ -38,7 +38,9 @@ class GP : public GrGeometryProcessor {
 public:
     static GrGeometryProcessor* Make(SkArenaAlloc* arena, Mode mode,
                                      sk_sp<GrColorSpaceXform> colorSpaceXform) {
-        return arena->make<GP>(mode, std::move(colorSpaceXform));
+        return arena->make([&](void* ptr) {
+            return new (ptr) GP(mode, std::move(colorSpaceXform));
+        });
     }
 
     const char* name() const override { return "VertexColorXformGP"; }
@@ -95,8 +97,6 @@ class GP : public GrGeometryProcessor {
     }
 
 private:
-    friend class ::SkArenaAlloc; // for access to ctor
-
     GP(Mode mode, sk_sp<GrColorSpaceXform> colorSpaceXform)
             : INHERITED(kVertexColorSpaceBenchGP_ClassID)
             , fMode(mode)
diff --git a/gm/clockwise.cpp b/gm/clockwise.cpp
@@ -78,7 +78,9 @@ class ClockwiseGM : public skiagm::GpuGM {
 class ClockwiseTestProcessor : public GrGeometryProcessor {
 public:
     static GrGeometryProcessor* Make(SkArenaAlloc* arena, bool readSkFragCoord) {
-        return arena->make<ClockwiseTestProcessor>(readSkFragCoord);
+        return arena->make([&](void* ptr) {
+            return new (ptr) ClockwiseTestProcessor(readSkFragCoord);
+        });
     }
 
     const char* name() const final { return "ClockwiseTestProcessor"; }
@@ -92,8 +94,6 @@ class ClockwiseTestProcessor : public GrGeometryProcessor {
     bool readSkFragCoord() const { return fReadSkFragCoord; }
 
 private:
-    friend class ::SkArenaAlloc; // for access to ctor
-
     ClockwiseTestProcessor(bool readSkFragCoord)
             : GrGeometryProcessor(kClockwiseTestProcessor_ClassID)
             , fReadSkFragCoord(readSkFragCoord) {
diff --git a/gm/fwidth_squircle.cpp b/gm/fwidth_squircle.cpp
@@ -64,7 +64,9 @@ static constexpr GrGeometryProcessor::Attribute gVertex =
 class FwidthSquircleTestProcessor : public GrGeometryProcessor {
 public:
     static GrGeometryProcessor* Make(SkArenaAlloc* arena, const SkMatrix& viewMatrix) {
-        return arena->make<FwidthSquircleTestProcessor>(viewMatrix);
+        return arena->make([&](void* ptr) {
+            return new (ptr) FwidthSquircleTestProcessor(viewMatrix);
+        });
     }
 
     const char* name() const override { return "FwidthSquircleTestProcessor"; }
@@ -74,8 +76,6 @@ class FwidthSquircleTestProcessor : public GrGeometryProcessor {
     GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps&) const final;
 
 private:
-    friend class ::SkArenaAlloc; // for access to ctor
-
     FwidthSquircleTestProcessor(const SkMatrix& viewMatrix)
             : GrGeometryProcessor(kFwidthSquircleTestProcessor_ClassID)
             , fViewMatrix(viewMatrix) {
diff --git a/gm/samplelocations.cpp b/gm/samplelocations.cpp
@@ -96,7 +96,9 @@ class SampleLocationsGM : public GpuGM {
 class SampleLocationsTestProcessor : public GrGeometryProcessor {
 public:
     static GrGeometryProcessor* Make(SkArenaAlloc* arena, GradType gradType) {
-        return arena->make<SampleLocationsTestProcessor>(gradType);
+        return arena->make([&](void* ptr) {
+            return new (ptr) SampleLocationsTestProcessor(gradType);
+        });
     }
 
     const char* name() const override { return "SampleLocationsTestProcessor"; }
@@ -108,8 +110,6 @@ class SampleLocationsTestProcessor : public GrGeometryProcessor {
     GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps&) const final;
 
 private:
-    friend class ::SkArenaAlloc; // for access to ctor
-
     SampleLocationsTestProcessor(GradType gradType)
             : GrGeometryProcessor(kSampleLocationsTestProcessor_ClassID)
             , fGradType(gradType) {
diff --git a/src/core/SkArenaAlloc.h b/src/core/SkArenaAlloc.h
@@ -72,8 +72,10 @@ class SkArenaAlloc {
 
     ~SkArenaAlloc();
 
-    template <typename T, typename... Args>
-    T* make(Args&&... args) {
+    template <typename Ctor>
+    auto make(Ctor&& ctor) -> decltype(ctor(nullptr)) {
+        using T = std::remove_pointer_t<decltype(ctor(nullptr))>;
+
         uint32_t size      = ToU32(sizeof(T));
         uint32_t alignment = ToU32(alignof(T));
         char* objStart;
@@ -96,7 +98,14 @@ class SkArenaAlloc {
         }
 
         // This must be last to make objects with nested use of this allocator work.
-        return new(objStart) T(std::forward<Args>(args)...);
+        return ctor(objStart);
+    }
+
+    template <typename T, typename... Args>
+    T* make(Args&&... args) {
+        return this->make([&](void* objStart) {
+            return new(objStart) T(std::forward<Args>(args)...);
+        });
     }
 
     template <typename T>
diff --git a/src/gpu/GrDefaultGeoProcFactory.cpp b/src/gpu/GrDefaultGeoProcFactory.cpp
@@ -39,8 +39,10 @@ class DefaultGeoProc : public GrGeometryProcessor {
                                      const SkMatrix& localMatrix,
                                      bool localCoordsWillBeRead,
                                      uint8_t coverage) {
-        return arena->make<DefaultGeoProc>(gpTypeFlags, color, viewMatrix, localMatrix, coverage,
-                                           localCoordsWillBeRead);
+        return arena->make([&](void* ptr) {
+            return new (ptr) DefaultGeoProc(gpTypeFlags, color, viewMatrix, localMatrix, coverage,
+                                            localCoordsWillBeRead);
+        });
     }
 
     const char* name() const override { return "DefaultGeometryProcessor"; }
@@ -194,8 +196,6 @@ class DefaultGeoProc : public GrGeometryProcessor {
     }
 
 private:
-    friend class ::SkArenaAlloc; // for access to ctor
-
     DefaultGeoProc(uint32_t gpTypeFlags,
                    const SkPMColor4f& color,
                    const SkMatrix& viewMatrix,
diff --git a/src/gpu/effects/GrBezierEffect.h b/src/gpu/effects/GrBezierEffect.h
@@ -69,8 +69,10 @@ class GrConicEffect : public GrGeometryProcessor {
             return nullptr;
         }
 
-        return arena->make<GrConicEffect>(color, viewMatrix, coverage, localMatrix,
-                                          usesLocalCoords);
+        return arena->make([&](void* ptr) {
+            return new (ptr) GrConicEffect(color, viewMatrix, coverage, localMatrix,
+                                           usesLocalCoords);
+        });
     }
 
     ~GrConicEffect() override;
@@ -92,8 +94,6 @@ class GrConicEffect : public GrGeometryProcessor {
     GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps&) const override;
 
 private:
-    friend class ::SkArenaAlloc; // for access to ctor
-
     GrConicEffect(const SkPMColor4f&, const SkMatrix& viewMatrix, uint8_t coverage,
                   const SkMatrix& localMatrix, bool usesLocalCoords);
 
@@ -136,7 +136,10 @@ class GrQuadEffect : public GrGeometryProcessor {
             return nullptr;
         }
 
-        return arena->make<GrQuadEffect>(color, viewMatrix, coverage, localMatrix, usesLocalCoords);
+        return arena->make([&](void* ptr) {
+            return new (ptr) GrQuadEffect(color, viewMatrix, coverage, localMatrix,
+                                          usesLocalCoords);
+        });
     }
 
     ~GrQuadEffect() override;
@@ -158,8 +161,6 @@ class GrQuadEffect : public GrGeometryProcessor {
     GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps&) const override;
 
 private:
-    friend class ::SkArenaAlloc; // for access to ctor
-
     GrQuadEffect(const SkPMColor4f&, const SkMatrix& viewMatrix, uint8_t coverage,
                  const SkMatrix& localMatrix, bool usesLocalCoords);
 
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.h b/src/gpu/effects/GrBitmapTextGeoProc.h
@@ -35,8 +35,10 @@ class GrBitmapTextGeoProc : public GrGeometryProcessor {
                                      GrMaskFormat format,
                                      const SkMatrix& localMatrix,
                                      bool usesW) {
-        return arena->make<GrBitmapTextGeoProc>(caps, color, wideColor, views, numActiveViews,
-                                                p, format, localMatrix, usesW);
+        return arena->make([&](void* ptr) {
+            return new (ptr) GrBitmapTextGeoProc(caps, color, wideColor, views, numActiveViews,
+                                                 p, format, localMatrix, usesW);
+        });
     }
 
     ~GrBitmapTextGeoProc() override {}
@@ -60,8 +62,6 @@ class GrBitmapTextGeoProc : public GrGeometryProcessor {
     GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps& caps) const override;
 
 private:
-    friend class ::SkArenaAlloc; // for access to ctor
-
     GrBitmapTextGeoProc(const GrShaderCaps&, const SkPMColor4f&, bool wideColor,
                         const GrSurfaceProxyView* views, int numViews, GrSamplerState params,
                         GrMaskFormat format, const SkMatrix& localMatrix, bool usesW);
diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.h b/src/gpu/effects/GrDistanceFieldGeoProc.h
@@ -66,8 +66,10 @@ class GrDistanceFieldA8TextGeoProc : public GrGeometryProcessor {
                                      float lum,
                                      uint32_t flags,
                                      const SkMatrix& localMatrixIfUsesLocalCoords) {
-        return arena->make<GrDistanceFieldA8TextGeoProc>(
-                caps, views, numActiveViews, params, lum, flags, localMatrixIfUsesLocalCoords);
+        return arena->make([&](void* ptr) {
+            return new (ptr) GrDistanceFieldA8TextGeoProc(
+                    caps, views, numActiveViews, params, lum, flags, localMatrixIfUsesLocalCoords);
+        });
     }
 #else
     static GrGeometryProcessor* Make(SkArenaAlloc* arena,
@@ -77,8 +79,10 @@ class GrDistanceFieldA8TextGeoProc : public GrGeometryProcessor {
                                      GrSamplerState params,
                                      uint32_t flags,
                                      const SkMatrix& localMatrixIfUsesLocalCoords) {
-        return arena->make<GrDistanceFieldA8TextGeoProc>(
-                caps, views, numActiveViews, params, flags, localMatrixIfUsesLocalCoords);
+        return arena->make([&](void* ptr) {
+            return new (ptr) GrDistanceFieldA8TextGeoProc(
+                    caps, views, numActiveViews, params, flags, localMatrixIfUsesLocalCoords);
+        });
     }
 #endif
 
@@ -103,8 +107,6 @@ class GrDistanceFieldA8TextGeoProc : public GrGeometryProcessor {
     GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps&) const override;
 
 private:
-    friend class ::SkArenaAlloc; // for access to ctor
-
     GrDistanceFieldA8TextGeoProc(const GrShaderCaps& caps,
                                  const GrSurfaceProxyView* views,
                                  int numActiveViews,
@@ -148,8 +150,10 @@ class GrDistanceFieldPathGeoProc : public GrGeometryProcessor {
                                      const SkMatrix& matrix, bool wideColor,
                                      const GrSurfaceProxyView* views, int numActiveViews,
                                      GrSamplerState params, uint32_t flags) {
-        return arena->make<GrDistanceFieldPathGeoProc>(caps, matrix, wideColor, views,
-                                                       numActiveViews, params, flags);
+        return arena->make([&](void* ptr) {
+            return new (ptr) GrDistanceFieldPathGeoProc(caps, matrix, wideColor, views,
+                                                        numActiveViews, params, flags);
+        });
     }
 
     ~GrDistanceFieldPathGeoProc() override {}
@@ -170,8 +174,6 @@ class GrDistanceFieldPathGeoProc : public GrGeometryProcessor {
     GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps&) const override;
 
 private:
-    friend class ::SkArenaAlloc; // for access to ctor
-
     GrDistanceFieldPathGeoProc(const GrShaderCaps& caps,
                                const SkMatrix& matrix,
                                bool wideColor,
@@ -228,9 +230,11 @@ class GrDistanceFieldLCDTextGeoProc : public GrGeometryProcessor {
                                      DistanceAdjust distanceAdjust,
                                      uint32_t flags,
                                      const SkMatrix& localMatrixIfUsesLocalCoords) {
-        return arena->make<GrDistanceFieldLCDTextGeoProc>(caps, views, numActiveViews, params,
-                                                          distanceAdjust, flags,
-                                                          localMatrixIfUsesLocalCoords);
+        return arena->make([&](void* ptr) {
+            return new (ptr) GrDistanceFieldLCDTextGeoProc(caps, views, numActiveViews, params,
+                                                           distanceAdjust, flags,
+                                                           localMatrixIfUsesLocalCoords);
+        });
     }
 
     ~GrDistanceFieldLCDTextGeoProc() override {}
@@ -252,8 +256,6 @@ class GrDistanceFieldLCDTextGeoProc : public GrGeometryProcessor {
     GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps&) const override;
 
 private:
-    friend class ::SkArenaAlloc; // for access to ctor
-
     GrDistanceFieldLCDTextGeoProc(const GrShaderCaps& caps, const GrSurfaceProxyView* views,
                                   int numActiveViews, GrSamplerState params, DistanceAdjust wa,
                                   uint32_t flags, const SkMatrix& localMatrix);
diff --git a/src/gpu/effects/GrShadowGeoProc.h b/src/gpu/effects/GrShadowGeoProc.h
@@ -22,7 +22,9 @@ class GrSurfaceProxyView;
 class GrRRectShadowGeoProc : public GrGeometryProcessor {
 public:
     static GrGeometryProcessor* Make(SkArenaAlloc* arena, const GrSurfaceProxyView& lutView) {
-        return arena->make<GrRRectShadowGeoProc>(lutView);
+        return arena->make([&](void* ptr) {
+            return new (ptr) GrRRectShadowGeoProc(lutView);
+        });
     }
 
     const char* name() const override { return "RRectShadow"; }
@@ -37,8 +39,6 @@ class GrRRectShadowGeoProc : public GrGeometryProcessor {
     GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps&) const override;
 
 private:
-    friend class ::SkArenaAlloc; // for access to ctor
-
     GrRRectShadowGeoProc(const GrSurfaceProxyView& lutView);
 
     const TextureSampler& onTextureSampler(int i) const override { return fLUTTextureSampler; }
diff --git a/src/gpu/ops/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp
@@ -548,7 +548,9 @@ class QuadEdgeEffect : public GrGeometryProcessor {
                                      const SkMatrix& localMatrix,
                                      bool usesLocalCoords,
                                      bool wideColor) {
-        return arena->make<QuadEdgeEffect>(localMatrix, usesLocalCoords, wideColor);
+        return arena->make([&](void* ptr) {
+            return new (ptr) QuadEdgeEffect(localMatrix, usesLocalCoords, wideColor);
+        });
     }
 
     ~QuadEdgeEffect() override {}
@@ -639,8 +641,6 @@ class QuadEdgeEffect : public GrGeometryProcessor {
     }
 
 private:
-    friend class ::SkArenaAlloc; // for access to ctor
-
     QuadEdgeEffect(const SkMatrix& localMatrix, bool usesLocalCoords, bool wideColor)
             : INHERITED(kQuadEdgeEffect_ClassID)
             , fLocalMatrix(localMatrix)
diff --git a/src/gpu/ops/GrDashOp.cpp b/src/gpu/ops/GrDashOp.cpp
@@ -837,7 +837,6 @@ class DashingCircleEffect : public GrGeometryProcessor {
 
 private:
     friend class GLDashingCircleEffect;
-    friend class ::SkArenaAlloc; // for access to ctor
 
     DashingCircleEffect(const SkPMColor4f&, AAMode aaMode, const SkMatrix& localMatrix,
                         bool usesLocalCoords);
@@ -969,7 +968,9 @@ GrGeometryProcessor* DashingCircleEffect::Make(SkArenaAlloc* arena,
                                                AAMode aaMode,
                                                const SkMatrix& localMatrix,
                                                bool usesLocalCoords) {
-    return arena->make<DashingCircleEffect>(color, aaMode, localMatrix, usesLocalCoords);
+    return arena->make([&](void* ptr) {
+        return new (ptr) DashingCircleEffect(color, aaMode, localMatrix, usesLocalCoords);
+    });
 }
 
 void DashingCircleEffect::getGLSLProcessorKey(const GrShaderCaps& caps,
@@ -1047,7 +1048,6 @@ class DashingLineEffect : public GrGeometryProcessor {
 
 private:
     friend class GLDashingLineEffect;
-    friend class ::SkArenaAlloc; // for access to ctor
 
     DashingLineEffect(const SkPMColor4f&, AAMode aaMode, const SkMatrix& localMatrix,
                       bool usesLocalCoords);
@@ -1195,7 +1195,9 @@ GrGeometryProcessor* DashingLineEffect::Make(SkArenaAlloc* arena,
                                              AAMode aaMode,
                                              const SkMatrix& localMatrix,
                                              bool usesLocalCoords) {
-    return arena->make<DashingLineEffect>(color, aaMode, localMatrix, usesLocalCoords);
+    return arena->make([&](void* ptr) {
+        return new (ptr) DashingLineEffect(color, aaMode, localMatrix, usesLocalCoords);
+    });
 }
 
 void DashingLineEffect::getGLSLProcessorKey(const GrShaderCaps& caps,
diff --git a/src/gpu/ops/GrDrawVerticesOp.cpp b/src/gpu/ops/GrDrawVerticesOp.cpp
@@ -118,9 +118,11 @@ class VerticesGP : public GrGeometryProcessor {
                                      const SkVertices::Attribute* attrs,
                                      int attrCount,
                                      const MarkedMatrices* customMatrices) {
-        return arena->make<VerticesGP>(localCoordsType, colorArrayType, color,
-                                       std::move(colorSpaceXform), viewMatrix, attrs, attrCount,
-                                       customMatrices);
+        return arena->make([&](void* ptr) {
+            return new (ptr) VerticesGP(localCoordsType, colorArrayType, color,
+                                        std::move(colorSpaceXform), viewMatrix, attrs, attrCount,
+                                        customMatrices);
+        });
     }
 
     const char* name() const override { return "VerticesGP"; }
@@ -375,8 +377,6 @@ class VerticesGP : public GrGeometryProcessor {
     }
 
 private:
-    friend class ::SkArenaAlloc; // for access to ctor
-
     VerticesGP(LocalCoordsType localCoordsType,
                ColorArrayType colorArrayType,
                const SkPMColor4f& color,
diff --git a/src/gpu/ops/GrFillRRectOp.cpp b/src/gpu/ops/GrFillRRectOp.cpp
@@ -299,7 +299,9 @@ GrOp::CombineResult FillRRectOp::onCombineIfPossible(GrOp* op, SkArenaAlloc*, co
 class FillRRectOp::Processor : public GrGeometryProcessor {
 public:
     static GrGeometryProcessor* Make(SkArenaAlloc* arena, GrAAType aaType, ProcessorFlags flags) {
-        return arena->make<Processor>(aaType, flags);
+        return arena->make([&](void* ptr) {
+            return new (ptr) Processor(aaType, flags);
+        });
     }
 
     const char* name() const final { return "GrFillRRectOp::Processor"; }
@@ -311,8 +313,6 @@ class FillRRectOp::Processor : public GrGeometryProcessor {
     GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps&) const final;
 
 private:
-    friend class ::SkArenaAlloc; // for access to ctor
-
     Processor(GrAAType aaType, ProcessorFlags flags)
             : INHERITED(kGrFillRRectOp_Processor_ClassID)
             , fAAType(aaType)
diff --git a/src/gpu/ops/GrLatticeOp.cpp b/src/gpu/ops/GrLatticeOp.cpp
diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp
diff --git a/src/gpu/ops/GrQuadPerEdgeAA.cpp b/src/gpu/ops/GrQuadPerEdgeAA.cpp
diff --git a/tests/GrMeshTest.cpp b/tests/GrMeshTest.cpp
diff --git a/tests/GrPipelineDynamicStateTest.cpp b/tests/GrPipelineDynamicStateTest.cpp
diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp
