Avoid reloading font collection for spawned engines with compatible asset managers #50897
+225
−5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Nice, just tested this (two engines) and it seems to solve the issue: |
jiahaog
approved these changes
Feb 23, 2024
jason-simmons
approved these changes
Feb 23, 2024
assets/asset_resolver.h
Outdated
| @@ -81,6 +93,10 @@ class AssetResolver { | |||
| return {}; | |||
| }; | |||
|
|
|||
| virtual bool operator==(const AssetResolver& other) const = 0; | |||
|
|
|||
| bool operator!=(const AssetResolver& other) { return !operator==(other); } | |||
There was a problem hiding this comment.
nit: declare this method as const
shell/common/engine.cc
Outdated
| @@ -174,7 +175,8 @@ fml::WeakPtr<ImageGeneratorRegistry> Engine::GetImageGeneratorRegistry() { | |||
|
|
|||
| bool Engine::UpdateAssetManager( | |||
| const std::shared_ptr<AssetManager>& new_asset_manager) { | |||
| if (asset_manager_ == new_asset_manager) { | |||
| if ((asset_manager_ && new_asset_manager) && | |||
There was a problem hiding this comment.
nit: the parentheses around (asset_manager_ && new_asset_manager) are not needed
dnfield
added
the
autosubmit
auto-submit
bot
removed
the
autosubmit
|
auto label is removed for flutter/engine/50897, due to Pull request flutter/engine/50897 is not in a mergeable state. |
dnfield
added
the
autosubmit
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Feb 24, 2024
…mpatible asset managers (flutter/engine#50897)
auto-submit bot
pushed a commit
to flutter/flutter
that referenced
this pull request
Feb 24, 2024
…144090) flutter/engine@247971f...b7f7a84 2024-02-24 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from sO-oG6KoeFlPK2WLR... to Oac3MZ5VgZ9g3Q3cL... (flutter/engine#50946) 2024-02-24 dnfield@google.com Avoid reloading font collection for spawned engines with compatible asset managers (flutter/engine#50897) Also rolling transitive DEPS: fuchsia/sdk/core/linux-amd64 from sO-oG6KoeFlP to Oac3MZ5VgZ9g 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://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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@jason-simmons @jiahaog fyi
I need to figure out a test for this still but it seems to work. Hot restart is kind of a mess though, because
Engine::Restartnulls out the asset manager it ends up reloading the font collection for every engine after a restart. But we separately need to fix hot restart, it's not very usable on the example appFixes flutter/flutter#143701