Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Conversation

@cbracken
Copy link
Member

@cbracken cbracken commented Oct 27, 2024

Migrates Objective-C code in shell/gpu to ARC.

Migrate sk_cfp::reset(__bridge_retained ptr) to sk_cfp::retain(__bridge ptr). reset CFReleases the previously held pointer and sets the pointer to the new pointer. retain CFRetains the new pointer prior to setting it.

No changes to tests since this makes 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.

@stuartmorgan-g
Copy link
Contributor

test-exempt: code refactor with no semantic change

@cbracken cbracken marked this pull request as draft October 27, 2024 21:47
@flutter-dashboard
Copy link

This pull request has been changed to a draft. The currently pending flutter-gold status will not be able to resolve until a new commit is pushed or the change is marked ready for review again.

Migrates Objective-C code in shell/gpu to ARC.

No changes to tests since this makes no semantic changes.

Issue: flutter/flutter#137801
@cbracken cbracken marked this pull request as ready for review October 30, 2024 20:04
// Provide accumulated damage to rasterizer (area in current framebuffer that lags behind
// front buffer)
uintptr_t texture = reinterpret_cast<uintptr_t>(drawable.texture);
void* texture = (__bridge void*)drawable.texture;
Copy link
Member Author

Choose a reason for hiding this comment

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

ARC implicit type conversion really doesn't want to allow (__bridge uintptr_t), maybe it's... a bridge too far. Yeah I could reinterpret_cast the void* to a uintptr_t now that the pointer is bridged, but this seems fine.

Copy link
Contributor

Choose a reason for hiding this comment

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

Adjusting the types so that we no longer need the reinterpret_casts seems like pure win to me. The fact that it bypassed the compiler warning about needing a bridge is more evidence of how dangerous it is.

Copy link
Contributor

@stuartmorgan-g stuartmorgan-g left a comment

Choose a reason for hiding this comment

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

LGTM

// Provide accumulated damage to rasterizer (area in current framebuffer that lags behind
// front buffer)
uintptr_t texture = reinterpret_cast<uintptr_t>(drawable.texture);
void* texture = (__bridge void*)drawable.texture;
Copy link
Contributor

Choose a reason for hiding this comment

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

Adjusting the types so that we no longer need the reinterpret_casts seems like pure win to me. The fact that it bypassed the compiler warning about needing a bridge is more evidence of how dangerous it is.

@cbracken cbracken added the autosubmit Merge PR when tree becomes green via auto submit App label Oct 31, 2024
@auto-submit auto-submit bot merged commit a65f1d5 into flutter:main Oct 31, 2024
28 checks passed
@cbracken cbracken deleted the arc-gpu branch October 31, 2024 19:38
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Oct 31, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Oct 31, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Oct 31, 2024
…157960)

flutter/engine@f2154ef...bb77cf8

2024-10-31 [email protected] iOS: migrate Metal testing types to ARC (flutter/engine#56156)
2024-10-31 [email protected] iOS,macOS: migrate shell/gpu to ARC (flutter/engine#56157)
2024-10-31 [email protected] Roll Skia from 3c628426f85f to 9168ad248c69 (3 revisions) (flutter/engine#56272)
2024-10-31 [email protected] [Impeller] Reland: disable AHBs on devices that were upgraded to 29. (flutter/engine#56221)
2024-10-31 [email protected] Add `timeout` to `local_engine`. (flutter/engine#56271)
2024-10-31 [email protected] Refactor `ArgParser.usage` tests for `BuildPlan` to reduce duplication. (flutter/engine#56254)

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] 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
nick9822 pushed a commit to nick9822/flutter that referenced this pull request Dec 18, 2024
Migrates Objective-C code in shell/gpu to ARC.

Migrate `sk_cfp::reset(__bridge_retained ptr)` to `sk_cfp::retain(__bridge ptr)`. `reset` `CFRelease`s the previously held pointer and sets the pointer to the new pointer. `retain` `CFRetain`s the new pointer prior to setting it.

No changes to tests since this makes no semantic changes.

Issue: flutter#137801

[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.

Labels

autosubmit Merge PR when tree becomes green via auto submit App e: impeller

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants