make SK_SUPPORT_LEGACY_FONTMETRICS_IN_PAINT conditional

reed-at-google · Skia Commit-Bot · commit 340aeda6b3ba · 2018-12-12T19:54:51.000Z
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>
diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp
@@ -974,9 +974,11 @@ static SkTDArray<uint8_t> make_fuzz_text(Fuzz* fuzz, const SkFont& font, SkTextE
     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;
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -974,9 +974,11 @@ static SkTDArray<uint8_t> make_fuzz_text(Fuzz* fuzz, const SkFont& font, SkTextE`
`974`	`974`	`return array;`
`975`	`975`	`}`
`976`	`976`
	`977`	`+#ifdef SK_SUPPORT_LEGACY_FONTMETRICS_IN_PAINT`
`977`	`978`	`static SkTDArray<uint8_t> make_fuzz_text(Fuzz* fuzz, const SkPaint& paint) {`
`978`	`979`	`return make_fuzz_text(fuzz, SkFont::LEGACY_ExtractFromPaint(paint), paint.getTextEncoding());`
`979`	`980`	`}`
	`981`	`+#endif`
`980`	`982`
`981`	`983`	`static sk_sp<SkTextBlob> make_fuzz_textblob(Fuzz* fuzz) {`
`982`	`984`	`SkTextBlobBuilder textBlobBuilder;`