Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

iOS: Eliminate ScopedBlock, ScopedTypeRef, ScopedPolicy #56410

Merged
merged 1 commit into from
Nov 7, 2024

Conversation

cbracken
Copy link
Member

@cbracken cbracken commented Nov 6, 2024

Eliminates the two remaining uses of ScopedBlock and with it, ScopedTypeRef which was only used by ScopedBlock. ARC automatically generates the necessary block copy/retain/release calls, including moving blocks to the heap during a retain so manual _Block_copy/_Block_release calls are no longer required.

No test changes since no semantic changes.

Issue: flutter/flutter#137801

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
Copy link

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

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. The test exemption team is a small volunteer group, so all reviewers should feel empowered to ask for tests, without delegating that responsibility entirely to the test exemption group.

@@ -30,7 +29,7 @@ class PlatformMessageResponseDarwin : public flutter::PlatformMessageResponse {

~PlatformMessageResponseDarwin() override;

fml::ScopedBlock<PlatformMessageResponseCallback> callback_;
PlatformMessageResponseCallback callback_;
Copy link
Member Author

@cbracken cbracken Nov 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For reference, the typedef is here:

typedef void (^PlatformMessageResponseCallback)(NSData*);

@@ -33,7 +32,7 @@ class PlatformMessageHandlerIos : public PlatformMessageHandler {

struct HandlerInfo {
NSObject<FlutterTaskQueueDispatch>* task_queue;
fml::ScopedBlock<FlutterBinaryMessageHandler> handler;
FlutterBinaryMessageHandler handler;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typedef is here:

typedef void (^FlutterBinaryMessageHandler)(NSData* _Nullable message, FlutterBinaryReply reply);

Copy link
Contributor

@stuartmorgan stuartmorgan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@stuartmorgan
Copy link
Contributor

test-exempt: code refactor with no semantic change

@cbracken cbracken added the autosubmit Merge PR when tree becomes green via auto submit App label Nov 6, 2024
@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Nov 6, 2024
Copy link
Contributor

auto-submit bot commented Nov 6, 2024

auto label is removed for flutter/engine/56410, due to - The status or check suite Linux local_engine_builds has failed. Please fix the issues identified (or deflake) before re-applying this label.

@cbracken cbracken added the autosubmit Merge PR when tree becomes green via auto submit App label Nov 6, 2024
@cbracken cbracken changed the title iOS: Eliminate ScopedBlock, ScopedTypeRef iOS: Eliminate ScopedBlock, ScopedTypeRef, ScopedPolicy Nov 6, 2024
Copy link
Contributor

auto-submit bot commented Nov 6, 2024

auto label is removed for flutter/engine/56410, due to - The status or check suite Mac mac_host_engine has failed. Please fix the issues identified (or deflake) before re-applying this label.

  • The status or check suite Mac mac_clang_tidy has failed. Please fix the issues identified (or deflake) before re-applying this label.

@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Nov 6, 2024
Eliminates the two remaining uses of ScopedBlock and with it,
ScopedTypeRef which were only used by ScopedBlock. ARC automatically
generates the necessary block copy/retain/release calls, including
moving blocks to the heap during a retain so manual
_Block_copy/_Block_release calls are no longer required.

Though now unused, ScopedPolicy remains since I intend to use it in the
CFRef constructor and Reset methods.

Issue: flutter/flutter#137801
@cbracken cbracken added the autosubmit Merge PR when tree becomes green via auto submit App label Nov 7, 2024
@auto-submit auto-submit bot merged commit d132ada into flutter:main Nov 7, 2024
32 checks passed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 7, 2024
@cbracken cbracken deleted the bye-bye-scoped-block branch November 7, 2024 21:35
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 7, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
autosubmit Merge PR when tree becomes green via auto submit App platform-ios
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants