Commit 4ebb54ae authored by Mike Reed's avatar Mike Reed Committed by Commit Bot

pass SkFont, not SkPaint, to SkTextBlobBuilder

TBR=vmpstr

Bug: skia:2664
Change-Id: Ie4d397f2cc3f997abed9c4614a96333f5956c805
Reviewed-on: https://chromium-review.googlesource.com/c/1351819
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: default avatarFlorin Malita <fmalita@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612155}
parent 67be413d
...@@ -13,8 +13,7 @@ namespace { ...@@ -13,8 +13,7 @@ namespace {
constexpr size_t kDefaultBudget = 1024u; constexpr size_t kDefaultBudget = 1024u;
sk_sp<SkTextBlob> CreateBlob() { sk_sp<SkTextBlob> CreateBlob() {
SkPaint font; SkFont font;
font.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
font.setTypeface(SkTypeface::MakeDefault()); font.setTypeface(SkTypeface::MakeDefault());
SkTextBlobBuilder builder; SkTextBlobBuilder builder;
......
...@@ -164,8 +164,7 @@ TEST_F(PaintOpPerfTest, TextOps) { ...@@ -164,8 +164,7 @@ TEST_F(PaintOpPerfTest, TextOps) {
auto typeface = SkTypeface::MakeDefault(); auto typeface = SkTypeface::MakeDefault();
SkPaint font; SkFont font;
font.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
font.setTypeface(typeface); font.setTypeface(typeface);
SkTextBlobBuilder builder; SkTextBlobBuilder builder;
......
...@@ -140,10 +140,6 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal, ...@@ -140,10 +140,6 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal,
# define SK_SUPPORT_LEGACY_ANISOTROPIC_MIPMAP_SCALE # define SK_SUPPORT_LEGACY_ANISOTROPIC_MIPMAP_SCALE
#endif #endif
#ifndef SK_SUPPORT_LEGACY_TEXTBLOBBUILD_WITH_PAINT
#define SK_SUPPORT_LEGACY_TEXTBLOBBUILD_WITH_PAINT
#endif
// Remove this after we fixed all the issues related to the new SDF algorithm // Remove this after we fixed all the issues related to the new SDF algorithm
// (https://codereview.chromium.org/1643143002) // (https://codereview.chromium.org/1643143002)
#ifndef SK_USE_LEGACY_DISTANCE_FIELDS #ifndef SK_USE_LEGACY_DISTANCE_FIELDS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment