hide getMetaData()

Bug: skia:
Change-Id: I2b513d4c5868bc0d4cdcdf0c95cc35e90c98f9a1
Reviewed-on: https://skia-review.googlesource.com/c/188824
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Auto-Submit: Mike Reed <reed@google.com>

Author: reed-at-google

include/core/SkCanvas.h

@@ -41,7 +41,6 @@ class SkFont;
 class SkGlyphRunBuilder;
 class SkImage;
 class SkImageFilter;
-class SkMetaData;
 class SkPath;
 class SkPicture;
 class SkPixmap;
@@ -52,6 +51,10 @@ class SkSurface;
 class SkSurface_Base;
 class SkTextBlob;
 
+#ifdef SK_SUPPORT_LEGACY_CANVAS_METADATA
+class SkMetaData;
+#endif
+
 /** \class SkCanvas
     SkCanvas provides an interface for drawing, and how the drawing is clipped and transformed.
     SkCanvas contains a stack of SkMatrix and clip values.
@@ -217,13 +220,14 @@ class SK_API SkCanvas {
     */
     virtual ~SkCanvas();
 
+#ifdef SK_SUPPORT_LEGACY_CANVAS_METADATA
     /** Returns storage to associate additional data with the canvas.
         The storage is freed when SkCanvas is deleted.
 
         @return  storage that can be read from and written to
     */
     SkMetaData& getMetaData();
-
+#endif
     /** Returns SkImageInfo for SkCanvas. If SkCanvas is not associated with raster surface or
         GPU surface, returned SkColorType is set to kUnknown_SkColorType.
 
@@ -2519,7 +2523,9 @@ class SK_API SkCanvas {
 
     int         fSaveCount;         // value returned by getSaveCount()
 
+#ifdef SK_SUPPORT_LEGACY_CANVAS_METADATA
     SkMetaData* fMetaData;
+#endif
     std::unique_ptr<SkRasterHandleAllocator> fAllocator;
 
     SkSurface_Base*  fSurfaceBase;

src/core/SkCanvas.cpp

@@ -551,7 +551,9 @@ void SkCanvas::resetForNextPicture(const SkIRect& bounds) {
 void SkCanvas::init(sk_sp<SkBaseDevice> device) {
     fAllowSimplifyClip = false;
     fSaveCount = 1;
+#ifdef SK_SUPPORT_LEGACY_CANVAS_METADATA
     fMetaData = nullptr;
+#endif
 
     fMCRec = (MCRec*)fMCStack.push_back();
     new (fMCRec) MCRec;
@@ -660,11 +662,14 @@ SkCanvas::~SkCanvas() {
 
     this->internalRestore();    // restore the last, since we're going away
 
+#ifdef SK_SUPPORT_LEGACY_CANVAS_METADATA
     delete fMetaData;
+#endif
 
     dec_canvas();
 }
 
+#ifdef SK_SUPPORT_LEGACY_CANVAS_METADATA
 SkMetaData& SkCanvas::getMetaData() {
     // metadata users are rare, so we lazily allocate it. If that changes we
     // can decide to just make it a field in the device (rather than a ptr)
@@ -673,6 +678,7 @@ SkMetaData& SkCanvas::getMetaData() {
     }
     return *fMetaData;
 }
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////