commit 966348413f3452d077fca600455bc497c7ad3662
author Kevin Lubick <kjlubick@google.com> Tue Mar 05 14:09:24 2019 -0500
committer Kevin Lubick <kjlubick@google.com> Tue Mar 05 20:44:10 2019 +0000
tree 2cb7dc60e8ce2fc814d69cac5630acc2a44bcce8
parent b93525506e7d673d3e74772de05ff462c51b2d03

[particles] Clean up build - remove test deps


Bug: skia:
Change-Id: I499262277ac1c8d92a39a66f6e846e248b102aef
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/197767
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>

modules/particles/src/SkParticleAffector.cpp

diff --git a/modules/particles/src/SkParticleAffector.cpp b/modules/particles/src/SkParticleAffector.cpp
index 655fa29..b5308f4 100644
--- a/modules/particles/src/SkParticleAffector.cpp
+++ b/modules/particles/src/SkParticleAffector.cpp
@@ -15,7 +15,6 @@
 #include "SkRandom.h"
 #include "SkTextUtils.h"
 
-#include "sk_tool_utils.h"
 
 void SkParticleAffector::apply(const SkParticleUpdateParams& params,
                                SkParticleState ps[], int count) {
@@ -350,8 +349,8 @@
             return;
         }
 
-        SkFont font(sk_tool_utils::create_portable_typeface());
-        font.setSize(fFontSize);
+        // Use the font manager's default font
+        SkFont font(nullptr, fFontSize);
         SkPath path;
         SkTextUtils::GetPath(fText.c_str(), fText.size(), kUTF8_SkTextEncoding, 0, 0, font, &path);
         SkContourMeasureIter iter(path, false);