[Impeller] Fixed TypographerTest.MaybeHasOverlapping (flutter#42429)

fixes flutter/flutter#127714 [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
brianosman · May 30, 2023 · dff1847 · dff1847
1 parent 1ba8091
commit dff1847
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/impeller/typographer/typographer_unittests.cc b/impeller/typographer/typographer_unittests.cc
@@ -9,6 +9,7 @@
 #include "impeller/typographer/lazy_glyph_atlas.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkData.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/core/SkTextBlob.h"
 
 // TODO(zanderso): https://github.com/flutter/flutter/issues/127701
@@ -292,7 +293,11 @@ TEST_P(TypographerTest, FontGlyphPairTypeChangesHashAndEquals) {
 }
 
 TEST_P(TypographerTest, MaybeHasOverlapping) {
-  SkFont sk_font;
+  sk_sp<SkFontMgr> font_mgr = SkFontMgr::RefDefault();
+  sk_sp<SkTypeface> typeface =
+      font_mgr->matchFamilyStyle("Arial", SkFontStyle::Normal());
+  SkFont sk_font(typeface, 0.5f);
+
   auto frame = TextFrameFromTextBlob(SkTextBlob::MakeFromString("1", sk_font));
   // Single character has no overlapping
   ASSERT_FALSE(frame.MaybeHasOverlapping());

diff --git a/testing/run_tests.py b/testing/run_tests.py
@@ -1200,12 +1200,8 @@ def main():
           build_dir,
           'impeller_unittests',
           engine_filter,
-          # TODO(https://github.com/flutter/flutter/issues/127714): Remove test exemption.
-          shuffle_flags + [
-              '--gtest_filter=-'
-              '*/OpenGLES:'
-              'Play/TypographerTest.MaybeHasOverlapping/Vulkan:'
-          ],
+          shuffle_flags + ['--gtest_filter=-'
+                           '*/OpenGLES:'],
           coverage=args.coverage
       )
     finally: