Skwasm Font Loading #41246

eyebrowsoffire · 2023-04-15T17:18:04Z

This implements font loading for the skwasm renderer.

In addition, it does some pretty major refactors:

Simplified the font collection interface to just have a single loadAssetFonts call, without the separate registration and debug fonts loading stuff
Debug fonts load now through http/asset mocking mechanisms instead of having a separate downloadDebugTestFonts call
Consolidated a few of our different unit test setup functions into a single setUpUnitTests function

…S backends cause issues.

… relying on.

lib/web_ui/lib/src/engine/fonts.dart

kevmoo · 2023-05-04T06:44:10Z

lib/web_ui/lib/src/engine/skwasm/skwasm_impl/font_collection.dart


 class SkwasmFontCollection implements FlutterFontCollection {
+  SkwasmFontCollection() : _handle = fontCollectionCreate();
+
+  FontCollectionHandle _handle;


clear recreates the underlying font collection, so the handle can't be final.

harryterkelsen

LGTM

The setupUnitTests addition is very nice

This reverts commit 2393e69.

Reverts #41246 The new font manifest parsing fails in some cases.

…126115) flutter/engine@4d50706...269ce2d 2023-05-05 skia-flutter-autoroll@skia.org Roll Fuchsia Mac SDK from SD8Q_B7eWZqLgqo0f... to de2Eqw0IsOzTq15m3... (flutter/engine#41755) 2023-05-04 skia-flutter-autoroll@skia.org Roll Skia from 00693e987828 to 6577130e14b6 (1 revision) (flutter/engine#41752) 2023-05-04 jacksongardner@google.com Revert "Skwasm Font Loading" (flutter/engine#41750) 2023-05-04 skia-flutter-autoroll@skia.org Roll Dart SDK from 95e133dbd3a6 to afeed9f8701e (1 revision) (flutter/engine#41749) 2023-05-04 magder@google.com Fix flaky FlutterChannelsTests, stop mocking `NSObject` (flutter/engine#41747) 2023-05-04 skia-flutter-autoroll@skia.org Roll Skia from a4828415b4af to 00693e987828 (6 revisions) (flutter/engine#41746) 2023-05-04 godofredoc@google.com Migrate linux unopt to engine_v2. (flutter/engine#41658) 2023-05-04 jonahwilliams@google.com [Impeller] check if path is Rect/RRect/Oval (flutter/engine#41744) 2023-05-04 lhkbob@gmail.com Add temporary staging GN arg for Skia roll (flutter/engine#41743) 2023-05-04 jason-simmons@users.noreply.github.com Roll buildroot to 05ec9f7124191c7ba354521f3ffd34b09af872e7 (flutter/engine#41736) 2023-05-04 skia-flutter-autoroll@skia.org Roll Dart SDK from 7b56aac98a5a to 95e133dbd3a6 (1 revision) (flutter/engine#41741) 2023-05-04 dnfield@google.com Disable flaky tests on arm64 (flutter/engine#41740) 2023-05-04 skia-flutter-autoroll@skia.org Roll Skia from 6950f56ad2ec to a4828415b4af (2 revisions) (flutter/engine#41737) 2023-05-04 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from LIacrdFhuTuHnYh0B... to m0-fwGyFnoDVAvxgk... (flutter/engine#41738) 2023-05-04 jacksongardner@google.com Skwasm Font Loading (flutter/engine#41246) 2023-05-04 godofredoc@google.com Migrate linux_host_engine to engine v2. (flutter/engine#41715) Also rolling transitive DEPS: fuchsia/sdk/core/linux-amd64 from LIacrdFhuTuH to m0-fwGyFnoDV fuchsia/sdk/core/mac-amd64 from SD8Q_B7eWZqL to de2Eqw0IsOzT If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC jimgraham@google.com,rmistry@google.com,zra@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

This relands #41246, which had to be reverted due to some issues parsing the font manifest.

eyebrowsoffire added 2 commits April 14, 2023 17:32

Started skwasm fonts implementation.

4e7c927

Fix mock http stuff to allow read callback.

ee37876

flutter-dashboard bot added the platform-web Code specifically for the web engine label Apr 15, 2023

eyebrowsoffire added 27 commits April 15, 2023 10:18

Merge branch 'main' into skwasm_fonts

b221162

Update licenses golden.

a11804e

Fix typo in function name.

553e23f

Don't dartify values of string chunks.

42d56a7

Merge branch 'main' into skwasm_fonts

b1ed991

Avoid using the JSUint8Array type objects, as the typedefs on the J…

4fb3179

…S backends cause issues.

Change typed array's set signature.

e5148b1

Update licenses golden.

77f0010

Fix some unit tests.

393ea59

Merge branch 'main' into skwasm_fonts

0c2a2b4

Reorganized some testing things.

1946222

Merge branch 'main' into skwasm_fonts

fd423fe

Update licenses golden.

bf1f0fe

Merge branch 'main' into skwasm_fonts

4da620f

Merge branch 'main' into skwasm_fonts

c3207d9

Reverted some of the test reorganization stuff that the framework was…

f748764

… relying on.

Merge branch 'main' into skwasm_fonts

fc03551

Update licenses golden.

e2f2968

Merge branch 'main' into skwasm_fonts

bff36e4

Partway through font loading refactor.

1689301

More unit test fixes.

99f0787

More unit test fixes.

65afc9b

More unit test fixes.

58877c3

Fix some more unit tests.

b443e65

Merge branch 'main' into skwasm_fonts

7176cc4

Fix some formatting.

eeaa29c

Merge branch 'main' into skwasm_fonts

a05e3e1

kevmoo reviewed May 4, 2023

View reviewed changes

lib/web_ui/lib/src/engine/fonts.dart Outdated Show resolved Hide resolved

kevmoo reviewed May 4, 2023

View reviewed changes

eyebrowsoffire added 2 commits May 4, 2023 10:33

Remove some unused stuff and add a few finals

7d6e649

Merge branch 'main' into skwasm_fonts

da60d47

harryterkelsen approved these changes May 4, 2023

View reviewed changes

eyebrowsoffire added the autosubmit Merge PR when tree becomes green via auto submit App label May 4, 2023

auto-submit bot merged commit 2393e69 into flutter:main May 4, 2023

engine-flutter-autoroll mentioned this pull request May 4, 2023

Roll Flutter Engine from 4d5070672859 to 2393e69c88f5 (2 revisions) flutter/flutter#126089

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 4, 2023

2393e69c8 Skwasm Font Loading (flutter/engine#41246)

b181a2a

engine-flutter-autoroll mentioned this pull request May 4, 2023

Roll Flutter Engine from 4d5070672859 to fd1326da94ae (4 revisions) flutter/flutter#126094

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 4, 2023

2393e69c8 Skwasm Font Loading (flutter/engine#41246)

8c85fcc

engine-flutter-autoroll mentioned this pull request May 4, 2023

Roll Flutter Engine from 4d5070672859 to 9b2d1923793f (5 revisions) flutter/flutter#126095

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 4, 2023

2393e69c8 Skwasm Font Loading (flutter/engine#41246)

dceb7c8

engine-flutter-autoroll mentioned this pull request May 4, 2023

Roll Flutter Engine from 4d5070672859 to 5824ac820b60 (7 revisions) flutter/flutter#126107

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 4, 2023

2393e69c8 Skwasm Font Loading (flutter/engine#41246)

afacf18

engine-flutter-autoroll mentioned this pull request May 4, 2023

Roll Flutter Engine from 4d5070672859 to 148fd96497b9 (9 revisions) flutter/flutter#126110

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 4, 2023

2393e69c8 Skwasm Font Loading (flutter/engine#41246)

5d4a248

eyebrowsoffire added a commit that referenced this pull request May 4, 2023

Revert "Skwasm Font Loading (#41246)"

ef618de

This reverts commit 2393e69.

eyebrowsoffire mentioned this pull request May 4, 2023

Revert "Skwasm Font Loading" #41750

Merged

auto-submit bot pushed a commit that referenced this pull request May 4, 2023

Revert "Skwasm Font Loading" (#41750)

901503d

Reverts #41246 The new font manifest parsing fails in some cases.

eyebrowsoffire mentioned this pull request May 4, 2023

Reland "Skwasm Font Loading #41756

Merged

engine-flutter-autoroll mentioned this pull request May 5, 2023

Roll Flutter Engine from 4d5070672859 to 25d4e35870bb (15 revisions) flutter/flutter#126113

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 5, 2023

2393e69c8 Skwasm Font Loading (flutter/engine#41246)

1ab83e0

engine-flutter-autoroll mentioned this pull request May 5, 2023

Roll Flutter Engine from 4d5070672859 to 269ce2deebeb (16 revisions) flutter/flutter#126115

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 5, 2023

2393e69c8 Skwasm Font Loading (flutter/engine#41246)

8a745cb

auto-submit bot pushed a commit that referenced this pull request May 8, 2023

Reland "Skwasm Font Loading (#41756)

a697088

This relands #41246, which had to be reverted due to some issues parsing the font manifest.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Skwasm Font Loading #41246

Skwasm Font Loading #41246

eyebrowsoffire commented Apr 15, 2023 •

edited

Loading

kevmoo May 4, 2023

eyebrowsoffire May 4, 2023

harryterkelsen left a comment

Skwasm Font Loading #41246

Skwasm Font Loading #41246

Conversation

eyebrowsoffire commented Apr 15, 2023 • edited Loading

kevmoo May 4, 2023

Choose a reason for hiding this comment

eyebrowsoffire May 4, 2023

Choose a reason for hiding this comment

harryterkelsen left a comment

Choose a reason for hiding this comment

eyebrowsoffire commented Apr 15, 2023 •

edited

Loading