This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Allow macOS plugins to register as app delegates #44587
Merged
Conversation
This file contains hidden or 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
|
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 Hixie on the #hackers channel in Chat (don't just cc him here, he won't see it! He's on 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. |
|
I forgot I still needed to add tests; marking as a draft for now. |
Adds `addApplicationDelegate:` to the macOS plugin registrar, following the corresponding iOS method, and wires it up to the existing app delegation forwarding that was recently added for use at the application level. (The actual delegate is non-trivially different between iOS and macOS, but that's not resolveable without a complex migration on the iOS side, so the APIs currently diverge after the level of the `addApplicationDelegate:` method itself.) This doesn't add any new methods to the delegation; those will be added in a follow-up PR. Most of flutter/flutter#41471
stuartmorgan-g
force-pushed
the
macos-plugin-app-delegate
branch
from
9865348 to
1edadc3
Compare
|
This is now tested and ready for review. |
stuartmorgan-g
commented
Aug 11, 2023
shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.mm
Show resolved
Hide resolved
| * handlers in FlutterAppLifecycleDelegate to any registered delegates. | ||
| */ | ||
| FLUTTER_DARWIN_EXPORT | ||
| @protocol FlutterAppLifecycleProvider <NSObject> |
There was a problem hiding this comment.
This change isn't strictly necessary, but it makes us match iOS, and it makes the engine code that uses these methods cleaner.
shell/platform/darwin/macos/framework/Headers/FlutterPluginRegistrarMacOS.h
Show resolved
Hide resolved
| @@ -165,7 +170,7 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result; | |||
| #pragma mark - | |||
|
|
|||
| @implementation FlutterEngineTerminationHandler { | |||
| FlutterEngine* _engine; | |||
| __weak FlutterEngine* _engine; | |||
There was a problem hiding this comment.
This fixes a retain cycle that will affect essentially all real-word, non-add-to-app cases (and was breaking my new test).
cbracken
reviewed
Aug 11, 2023
|
|
||
| - (void)removeApplicationLifecycleDelegate: | ||
| (nonnull NSObject<FlutterAppLifecycleDelegate>*)delegate { | ||
| auto i = std::find(_delegates.begin(), _delegates.end(), (__bridge void*)delegate); |
There was a problem hiding this comment.
Maybe delegateIndex for the minor readability benefit given the type is auto?
stuartmorgan-g
added
the
autosubmit
auto-submit
bot
removed
the
autosubmit
|
auto label is removed for flutter/engine/44587, due to - The status or check suite Linux mac_unopt has failed. Please fix the issues identified (or deflake) before re-applying this label. |
stuartmorgan-g
added
the
autosubmit
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Aug 11, 2023
auto-submit bot
pushed a commit
to flutter/flutter
that referenced
this pull request
Aug 11, 2023
…132407) flutter/engine@622ded9...832e780 2023-08-11 [email protected] Allow macOS plugins to register as app delegates (flutter/engine#44587) 2023-08-11 [email protected] Roll Skia from 68ea92de8f29 to 7dd695d828cf (1 revision) (flutter/engine#44643) 2023-08-11 [email protected] Roll Dart SDK from 83f96a990792 to ade04f1beb2c (1 revision) (flutter/engine#44642) 2023-08-11 [email protected] Roll Skia from fa30af9c2b80 to 68ea92de8f29 (2 revisions) (flutter/engine#44641) 2023-08-11 [email protected] [Impeller] Added benchmark for advanced blend. (flutter/engine#44450) 2023-08-11 [email protected] [Embedder] Refactor how semantic updates are mapped (flutter/engine#44553) 2023-08-11 [email protected] Roll Skia from cfb9844091fa to fa30af9c2b80 (1 revision) (flutter/engine#44639) 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://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
gaaclarke
pushed a commit
to gaaclarke/engine
that referenced
this pull request
Aug 30, 2023
Adds `addApplicationDelegate:` to the macOS plugin registrar, following the corresponding iOS method, and wires it up to the existing app delegation forwarding that was recently added for use at the application level. (The actual delegate is non-trivially different between iOS and macOS, but that's not resolveable without a complex migration on the iOS side, so the APIs currently diverge after the level of the `addApplicationDelegate:` method itself.) This doesn't add any new methods to the delegation; those will be added in a follow-up PR. Also fixes a retain cycle in the termination handler that prevented the new test from working. Most of flutter/flutter#41471 [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Adds
addApplicationDelegate:to the macOS plugin registrar, following the corresponding iOS method, and wires it up to the existing app delegation forwarding that was recently added for use at the application level. (The actual delegate is non-trivially different between iOS and macOS, but that's not resolveable without a complex migration on the iOS side, so the APIs currently diverge after the level of theaddApplicationDelegate:method itself.)This doesn't add any new methods to the delegation; those will be added in a follow-up PR.
Also fixes a retain cycle in the termination handler that prevented the new test from working.
Most of flutter/flutter#41471
Pre-launch Checklist
///).