commit 340aeda6b3ba50d145413685661b13edea0d52ad
author Mike Reed <reed@google.com> Wed Dec 12 14:00:19 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Dec 12 19:54:51 2018 +0000
tree 3ac147b7062291932097b82e5a4a6f28c410ba7f
parent f31f64ef2d79ec9033222f345519f37e22f3fca3

make SK_SUPPORT_LEGACY_FONTMETRICS_IN_PAINT conditional

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

fuzz/FuzzCanvas.cpp

diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp
index 471f9cd..2416f35 100644
--- a/fuzz/FuzzCanvas.cpp
+++ b/fuzz/FuzzCanvas.cpp
@@ -974,9 +974,11 @@
     return array;
 }
 
+#ifdef SK_SUPPORT_LEGACY_FONTMETRICS_IN_PAINT
 static SkTDArray<uint8_t> make_fuzz_text(Fuzz* fuzz, const SkPaint& paint) {
     return make_fuzz_text(fuzz, SkFont::LEGACY_ExtractFromPaint(paint), paint.getTextEncoding());
 }
+#endif
 
 static sk_sp<SkTextBlob> make_fuzz_textblob(Fuzz* fuzz) {
     SkTextBlobBuilder textBlobBuilder;

include/core/SkPaint.h

diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index f91d63e..007a328 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -27,7 +27,9 @@
 #include "SkMatrix.h"
 #include "SkRefCnt.h"
 
+#ifndef SK_SUPPORT_LEGACY_FONTMETRICS_IN_PAINT
 #define SK_SUPPORT_LEGACY_FONTMETRICS_IN_PAINT
+#endif
 
 class GrTextBlob;
 class SkAutoDescriptor;