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

[macOS] Consolidate FlutterViewController static types/data #51486

Merged
merged 2 commits into from
Mar 26, 2024

Conversation

cbracken
Copy link
Member

@cbracken cbracken commented Mar 18, 2024

No semantic changes, just consolidates static functions in FlutterViewController.mm local to the translation unit into a single contiguous block at the top.

Also includes three minor (non-semantic) changes:

  • Corrects static function naming to UpperCamelCase
  • Adds doc comments for OnKeyboardLayoutChanged
  • Adds a mark to help highlight the static data/function block at the top of the file in Xcode.

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

Copy link
Contributor

@dkwingsmt dkwingsmt 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

Looks like you'll have to revert the consolidation part though; the thing you moved uses a declaration in the controller's private declaration section, but the controller's private declaration section uses a struct from the anonymous namespace.

No semantic changes, just consolidates static functions in
FlutterViewController.mm local to the translation unit into a single
contiguous block at the top.

Also includes two minor (non-semantic) changes:
* Corrects static function naming to UpperCamelCase
* Adds a mark to help highlight the static data/function block at the
  top of the file in Xcode.
@cbracken cbracken changed the title [macOS] Consolidate static functions in one block [macOS] Consolidate static types/data in one block Mar 26, 2024
@cbracken cbracken changed the title [macOS] Consolidate static types/data in one block [macOS] Consolidate static types/data in FlutterViewController Mar 26, 2024
@cbracken cbracken changed the title [macOS] Consolidate static types/data in FlutterViewController [macOS] Consolidate FlutterViewController static types/data Mar 26, 2024
@cbracken cbracken added the autosubmit Merge PR when tree becomes green via auto submit App label Mar 26, 2024
@auto-submit auto-submit bot merged commit bc26e37 into flutter:main Mar 26, 2024
25 checks passed
@cbracken cbracken deleted the minor-cleanup branch March 26, 2024 21:57
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Mar 27, 2024
…145801)

flutter/engine@92ebd47...d872d50

2024-03-27 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from uu8lffXkeJQ9PC96I... to Lk8KBU-c97ROj-YHm... (flutter/engine#51690)
2024-03-26 zanderso@users.noreply.github.com Turn off internal retries for Android scenario app tests (flutter/engine#51689)
2024-03-26 skia-flutter-autoroll@skia.org Roll Skia from 1808016c7a6d to 23a5617e7f47 (1 revision) (flutter/engine#51688)
2024-03-26 chris@bracken.jp [macOS] Consolidate FlutterViewController static types/data (flutter/engine#51486)
2024-03-26 skia-flutter-autoroll@skia.org Roll Skia from 0590062821dc to 1808016c7a6d (3 revisions) (flutter/engine#51686)
2024-03-26 jonahwilliams@google.com [iOS] remove arbitrary framerate cap. (flutter/engine#51663)

Also rolling transitive DEPS:
  fuchsia/sdk/core/linux-amd64 from uu8lffXkeJQ9 to Lk8KBU-c97RO

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 jacksongardner@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
Labels
affects: desktop autosubmit Merge PR when tree becomes green via auto submit App platform-macos
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants