[canvaskit] Fall back to multi-context rendering on Firefox and Safari #49572

harryterkelsen · 2024-01-05T23:38:59Z

This PR refactors rasterization to support two different modes, single GL context mode backed by a single OffscreenCanvas (Chrome), and multi-context mode which uses many GL contexts and canvases.

Pre-launch Checklist

I read the Contributor Guide and followed the process outlined there for submitting PRs.
I read the Tree Hygiene wiki page, which explains my responsibilities.
I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
I listed at least one issue that this PR fixes in the description above.
I added new tests to check the change I am making or feature I am adding, or the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
I updated/added relevant documentation (doc comments with ///).
I signed the CLA.
All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

flutter-dashboard · 2024-01-05T23:39:02Z

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact "@test-exemption-reviewer" in the #hackers channel in Chat (don't just cc them here, they won't see it! Use Discord!).

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

flutter-dashboard · 2024-01-11T01:08:38Z

Golden file changes have been found for this pull request. Click here to view and triage (e.g. because this is an intentional change).

If you are still iterating on this change and are not ready to resolve the images on the Flutter Gold dashboard, consider marking this PR as a draft pull request above. You will still be able to view image results on the dashboard, commenting will be silenced, and the check will not try to resolve itself until marked ready for review.

Changes reported for pull request #49572 at sha 09ebf43

harryterkelsen · 2024-01-11T01:57:38Z

Will fix goldens tomorrow

… mode

lib/web_ui/lib/src/engine/canvaskit/multi_surface_rasterizer.dart

lib/web_ui/lib/src/engine/canvaskit/offscreen_canvas_rasterizer.dart

lib/web_ui/lib/src/engine/canvaskit/rasterizer.dart

lib/web_ui/lib/src/engine/canvaskit/surface.dart

lib/web_ui/lib/src/engine/platform_dispatcher.dart

yjbanov · 2024-01-11T23:39:31Z

lib/web_ui/test/canvaskit/overlay_canvas_factory_test.dart

@@ -13,11 +13,13 @@ void main() {
 }

 void testMain() {
-  group('$RenderCanvasFactory', () {
+  group('$OverlayCanvasFactory', () {


How do we test the two strategies? We want to make sure tests cover single and multi context modes.

The only difference between those modes is the factory function which creates the DisplayCanvas. This test is just for the functions of DisplayCanvas itself, so it should be agnostic to what kinds of DisplayCanvases are actually made. I refactored the test a bit to clarify that.

harryterkelsen

Thanks! PTAL

lib/web_ui/lib/src/engine/canvaskit/multi_surface_rasterizer.dart

lib/web_ui/lib/src/engine/canvaskit/offscreen_canvas_rasterizer.dart

lib/web_ui/lib/src/engine/canvaskit/rasterizer.dart

lib/web_ui/lib/src/engine/canvaskit/surface.dart

lib/web_ui/lib/src/engine/platform_dispatcher.dart

harryterkelsen · 2024-01-12T00:56:52Z

lib/web_ui/test/canvaskit/overlay_canvas_factory_test.dart

@@ -13,11 +13,13 @@ void main() {
 }

 void testMain() {
-  group('$RenderCanvasFactory', () {
+  group('$OverlayCanvasFactory', () {


The only difference between those modes is the factory function which creates the DisplayCanvas. This test is just for the functions of DisplayCanvas itself, so it should be agnostic to what kinds of DisplayCanvases are actually made. I refactored the test a bit to clarify that.

flutter-dashboard · 2024-01-16T22:17:06Z

Golden file changes are available for triage from new commit, Click here to view.

Changes reported for pull request #49572 at sha d440403

harryterkelsen · 2024-01-17T23:38:52Z

PTAL. I also added a test for the off-by-one blurriness issue in surface_test.dart.

yjbanov

harryterkelsen · 2024-01-18T19:25:09Z

Fixes flutter/flutter#140748

… and Safari (flutter/engine#49572)

parlough · 2024-01-18T20:36:28Z

Thanks @harryterkelsen!! Hope this will end up being temporary 🤞

…141800) flutter/engine@75400c4...f4a4f04 2024-01-18 [email protected] [canvaskit] Fall back to multi-context rendering on Firefox and Safari (flutter/engine#49572) 2024-01-18 [email protected] Use any mac machine available for orchestrator run. (flutter/engine#49845) 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 [email protected],[email protected],[email protected] 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://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

tomekit · 2024-03-02T17:53:18Z

Just a question, how do I check whether this landed in stable channel or perhaps if you know if this will end up somewhere in the 3.19.x?

mreinfurt · 2024-04-03T12:45:37Z

Just a question, how do I check whether this landed in stable channel or perhaps if you know if this will end up somewhere in the 3.19.x?

Looking for the same information here. Would be awesome if this landed in a hotfix.

flutter#49572) This PR refactors rasterization to support two different modes, single GL context mode backed by a single OffscreenCanvas (Chrome), and multi-context mode which uses many GL contexts and canvases. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide] and the [C++, Objective-C, Java style guides]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I added new tests to check the change I am making or feature I am adding, or the PR is [test-exempt]. See [testing the engine] for instructions on writing and running engine tests. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I signed the [CLA]. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord].  [Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene [test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests [Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style [testing the engine]: https://github.com/flutter/flutter/wiki/Testing-the-engine [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/wiki/Chat

…Safari (#52141) Cherry pick of #49572 to fix flutter/flutter#145563 Cherry-pick request issue: flutter/flutter#146787 [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style

github-actions bot added the platform-web Code specifically for the web engine label Jan 5, 2024

harryterkelsen force-pushed the canvaskit-refactor-rasterization branch from b5bd3ec to 9222b8e Compare January 10, 2024 23:45

flutter-dashboard bot added the will affect goldens label Jan 11, 2024

harryterkelsen added 7 commits January 11, 2024 10:20

Refactor rasterization to support single GL context and multi context…

db7c653

… mode

Undo formatting

9620664

WIP fixing semantics tests

d3757e7

Undo fixes for semantics tests

86457af

Implement dispose and max cache bytes

2bd517c

fix licenses

9a6a87a

Offset surface

408d8f6

harryterkelsen force-pushed the canvaskit-refactor-rasterization branch from 09ebf43 to 408d8f6 Compare January 11, 2024 22:02

harryterkelsen requested a review from yjbanov January 11, 2024 23:14

yjbanov suggested changes Jan 11, 2024

View reviewed changes

harryterkelsen requested a review from eyebrowsoffire January 11, 2024 23:41

harryterkelsen added 2 commits January 11, 2024 16:54

Rename OverlayCanvas to DisplayCanvas

ef19f8f

Revert debug print

c48f020

harryterkelsen commented Jan 12, 2024

View reviewed changes

harryterkelsen added 4 commits January 16, 2024 12:41

fix licenses

4510381

delete unused import

f046d69

Merge branch 'main' into canvaskit-refactor-rasterization

0731e64

Fix test

d440403

harryterkelsen requested a review from yjbanov January 16, 2024 22:55

harryterkelsen added 2 commits January 16, 2024 16:13

Merge branch 'main' into canvaskit-refactor-rasterization

9996044

Fix off-by-one blurriness bug

43d2734

harryterkelsen changed the title ~~[WIP][canvaskit] Fall back to multi-context rendering on Firefox and Safari~~ [canvaskit] Fall back to multi-context rendering on Firefox and Safari Jan 17, 2024

Add test for proper sizing of Surface

6e92c43

Fix analysis errors in test

6d0ede5

yjbanov approved these changes Jan 18, 2024

View reviewed changes

harryterkelsen added 3 commits January 17, 2024 16:35

Skip test on skwasm since same() doesn't work for JSValues

526610f

skip test on wasm

b27302b

remove unused import

abc1876

harryterkelsen merged commit f4a4f04 into flutter:main Jan 18, 2024

harryterkelsen mentioned this pull request Jan 18, 2024

Flutter Dashboard has visual glitches on latest Firefox flutter/flutter#141625

Closed

harryterkelsen mentioned this pull request Jan 18, 2024

App performance is slow on Firefox using latest master version. flutter/flutter#140748

Closed

engine-flutter-autoroll mentioned this pull request Jan 18, 2024

Roll Flutter Engine from 75400c49fa0b to f4a4f046b173 (2 revisions) flutter/flutter#141800

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 18, 2024

f4a4f046b [canvaskit] Fall back to multi-context rendering on Firefox…

5f20d9e

… and Safari (flutter/engine#49572)

parlough mentioned this pull request Jan 31, 2024

Preview version very slow on Firefox dart-lang/dart-pad#2767

Closed

This was referenced Mar 27, 2024

[Web] CanvasKit - RuntimeError: indirect call to null flutter/flutter#144731

Closed

[CP] [canvaskit] Fall back to multi-context rendering on Firefox and Safari #51730

Closed

harryterkelsen mentioned this pull request Apr 15, 2024

[CP] [canvaskit] Fall back to multi-context rendering on Firefox and Safari #52141

Merged

8 tasks

[canvaskit] Fall back to multi-context rendering on Firefox and Safari #49572

[canvaskit] Fall back to multi-context rendering on Firefox and Safari #49572

Uh oh!

Conversation

harryterkelsen commented Jan 5, 2024

Pre-launch Checklist

Uh oh!

flutter-dashboard bot commented Jan 5, 2024

Uh oh!

flutter-dashboard bot commented Jan 11, 2024

Uh oh!

harryterkelsen commented Jan 11, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

yjbanov Jan 11, 2024

Choose a reason for hiding this comment

Uh oh!

harryterkelsen Jan 12, 2024

Choose a reason for hiding this comment

Uh oh!

harryterkelsen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

harryterkelsen Jan 12, 2024

Choose a reason for hiding this comment

Uh oh!

flutter-dashboard bot commented Jan 16, 2024

Uh oh!

harryterkelsen commented Jan 17, 2024

Uh oh!

yjbanov left a comment

Choose a reason for hiding this comment

Uh oh!

harryterkelsen commented Jan 18, 2024

Uh oh!

parlough commented Jan 18, 2024

Uh oh!

tomekit commented Mar 2, 2024

Uh oh!

mreinfurt commented Apr 3, 2024

Uh oh!

Uh oh!