diff options
| author |  bungeman <bungeman@google.com> | 2016-10-18 08:03:42 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-19 15:56:28 +0000 |
| commit | 520ced63cf0750e207223169a31edb2a16e5ca96 (patch) | |
| tree | 1f0d0132c7c387af42e11e10800d501d4c0ea64b /src/gpu/GrPathRendering.cpp | |
| parent | 620ee4f744cefbf2fef60add803816398522baae (diff) | |
SkDescriptors to be held in unique_ptr.
This also removes the class operator new override along with
directly calling malloc in SkData, since it has a similar requirements.
CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN-Trybot;master.client.skia:Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN-Trybot
Change-Id: Ic68aacf2028d6964d9735a55558862afc9edd19b
Reviewed-on: https://skia-review.googlesource.com/3541
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'src/gpu/GrPathRendering.cpp')
| -rw-r--r-- | src/gpu/GrPathRendering.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/gpu/GrPathRendering.cpp b/src/gpu/GrPathRendering.cpp index fe912e23a2..5c6b3d3643 100644 --- a/src/gpu/GrPathRendering.cpp +++ b/src/gpu/GrPathRendering.cpp @@ -53,12 +53,6 @@ public: #endif {} - virtual ~GlyphGenerator() { -#ifdef SK_DEBUG - SkDescriptor::Free(fDesc); -#endif - } - int getNumPaths() override { return fScalerContext->getGlyphCount(); } @@ -76,7 +70,7 @@ public: private: const SkAutoTDelete<SkScalerContext> fScalerContext; #ifdef SK_DEBUG - SkDescriptor* const fDesc; + const std::unique_ptr<SkDescriptor> fDesc; #endif }; |