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

[macOS] Merge FlutterMetalCompositor, superclass #37648

Merged
merged 1 commit into from
Nov 16, 2022

Conversation

cbracken
Copy link
Member

Now that OpenGL support in Flutter on macOS has been removed, the only FlutterCompositor implementation is the Metal-based compositor. This patch merges it into the FlutterCompositor base class since there's no longer any reason to keep the interface separate from its implementation.

This patch will be followed by similar patches for the renderer, surface manager, and external textures.

Issue: flutter/flutter#108304
Issue: flutter/flutter#114445

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

Copy link
Member

@knopp knopp left a comment

Choose a reason for hiding this comment

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

Just some nits.

Now that OpenGL support in Flutter on macOS has been removed, the only
FlutterCompositor implementation is the Metal-based compositor. This
patch merges it into the FlutterCompositor base class since there's no
longer any reason to keep the interface separate from its implementation.

This patch will be followed by similar patches for the renderer, surface
manager, and external textures.

Issue: flutter/flutter#108304
Issue: flutter/flutter#114445
@cbracken
Copy link
Member Author

Nice catch!

@cbracken cbracken merged commit a062a20 into flutter:main Nov 16, 2022
@cbracken cbracken deleted the squash-compositor branch November 16, 2022 17:56
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 16, 2022
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Nov 16, 2022
sourcegraph-bot pushed a commit to sgtest/megarepo that referenced this pull request Nov 16, 2022
…lutter/engine#37648) (#115474)

Commit: d359af2434509fa3a417dd11912de2e8ca789d20
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Nov 17, 2022
* d359af2 a062a2063 [macOS] Merge FlutterMetalCompositor, superclass (flutter/engine#37648) (flutter/flutter#115474)

* cacf1d2 Roll Flutter Engine from a062a20638d1 to 97974ebb5ff8 (3 revisions) (flutter/flutter#115478)

* 490fe28 Updated instructions for adding new localized messages. (flutter/flutter#115390)

* 84357cb re-enable firebase release smoke test since infra outage is over (flutter/flutter#115402)

* f205471 Use concrete factory constructor for DomXMLHttpRequest (flutter/flutter#115094)

* 55927d8 3c83b275a [Impeller] Reland: Refactor color source resolution to use explicit factory types (flutter/engine#37677) (flutter/flutter#115482)

* 829e44d Fixed label alignment (flutter/flutter#115409)

* b579109 Roll Flutter Engine from 3c83b275a511 to 35ecb2bf4139 (2 revisions) (flutter/flutter#115495)

* d01874d [framework] re-rasterize page transition when layout size changes (flutter/flutter#115371)

* 68740a2 fee463552 Roll Fuchsia Linux SDK from T7_W8eoMNuMdG-5R9... to haqxMhaSf7-4ZeVL8... (flutter/engine#37684) (flutter/flutter#115498)

* 26a990f Roll Flutter Engine from fee463552a93 to c5e6a38dd0bc (2 revisions) (flutter/flutter#115504)

* f255390 Remove redundant arguments passed to redirecting factory constructors (flutter/flutter#115497)

* 20139c6 4f3f45617 Move windows engine_v2 to prod. (flutter/engine#37680) (flutter/flutter#115508)

* 2ad4dc5 dcdb96e9d Roll Skia from 1dfecd7cd478 to 7f385b0ae434 (9 revisions) (flutter/engine#37693) (flutter/flutter#115512)

* 9c54635 Bump codecov/codecov-action from 3.1.0 to 3.1.1 (flutter/flutter#113126)

* fafa11d Roll Flutter Engine from dcdb96e9db6b to cb403c1feaee (2 revisions) (flutter/flutter#115516)

* 59f389d Remove unneeded comparison to `double.nan` (flutter/flutter#115470)

* c071950 d422023f3 Migrate const_finder tests to be null safe (flutter/engine#37683) (flutter/flutter#115524)

* bf6d0f3 5bbf070c3 Roll Skia from 7f385b0ae434 to 8589c8ac6ee6 (1 revision) (flutter/engine#37702) (flutter/flutter#115531)

* 83d205e 7156b87c7 Roll Skia from 8589c8ac6ee6 to 68784d303cd6 (4 revisions) (flutter/engine#37705) (flutter/flutter#115538)

* 7e8568b 83c2482d7 [Impeller] Add Impeller scene (flutter/engine#37694) (flutter/flutter#115541)

* 07de108 ad3038c25 Roll Skia from 68784d303cd6 to 95ac3b53be37 (1 revision) (flutter/engine#37706) (flutter/flutter#115548)

* 1b23ad6 Roll Flutter Engine from ad3038c25cfa to 832aae2f850a (2 revisions) (flutter/flutter#115552)

* e8cbd44 Added Badge.isLabelVisible flag (flutter/flutter#115292)

* e9622ce Added Badge.count constructor (flutter/flutter#115297)

* 537f89c Revert "Added Badge.count constructor (#115297)" (flutter/flutter#115564)
percula pushed a commit to percula/packages that referenced this pull request Nov 17, 2022
* d359af2 a062a2063 [macOS] Merge FlutterMetalCompositor, superclass (flutter/engine#37648) (flutter/flutter#115474)

* cacf1d2 Roll Flutter Engine from a062a20638d1 to 97974ebb5ff8 (3 revisions) (flutter/flutter#115478)

* 490fe28 Updated instructions for adding new localized messages. (flutter/flutter#115390)

* 84357cb re-enable firebase release smoke test since infra outage is over (flutter/flutter#115402)

* f205471 Use concrete factory constructor for DomXMLHttpRequest (flutter/flutter#115094)

* 55927d8 3c83b275a [Impeller] Reland: Refactor color source resolution to use explicit factory types (flutter/engine#37677) (flutter/flutter#115482)

* 829e44d Fixed label alignment (flutter/flutter#115409)

* b579109 Roll Flutter Engine from 3c83b275a511 to 35ecb2bf4139 (2 revisions) (flutter/flutter#115495)

* d01874d [framework] re-rasterize page transition when layout size changes (flutter/flutter#115371)

* 68740a2 fee463552 Roll Fuchsia Linux SDK from T7_W8eoMNuMdG-5R9... to haqxMhaSf7-4ZeVL8... (flutter/engine#37684) (flutter/flutter#115498)

* 26a990f Roll Flutter Engine from fee463552a93 to c5e6a38dd0bc (2 revisions) (flutter/flutter#115504)

* f255390 Remove redundant arguments passed to redirecting factory constructors (flutter/flutter#115497)

* 20139c6 4f3f45617 Move windows engine_v2 to prod. (flutter/engine#37680) (flutter/flutter#115508)

* 2ad4dc5 dcdb96e9d Roll Skia from 1dfecd7cd478 to 7f385b0ae434 (9 revisions) (flutter/engine#37693) (flutter/flutter#115512)

* 9c54635 Bump codecov/codecov-action from 3.1.0 to 3.1.1 (flutter/flutter#113126)

* fafa11d Roll Flutter Engine from dcdb96e9db6b to cb403c1feaee (2 revisions) (flutter/flutter#115516)

* 59f389d Remove unneeded comparison to `double.nan` (flutter/flutter#115470)

* c071950 d422023f3 Migrate const_finder tests to be null safe (flutter/engine#37683) (flutter/flutter#115524)

* bf6d0f3 5bbf070c3 Roll Skia from 7f385b0ae434 to 8589c8ac6ee6 (1 revision) (flutter/engine#37702) (flutter/flutter#115531)

* 83d205e 7156b87c7 Roll Skia from 8589c8ac6ee6 to 68784d303cd6 (4 revisions) (flutter/engine#37705) (flutter/flutter#115538)

* 7e8568b 83c2482d7 [Impeller] Add Impeller scene (flutter/engine#37694) (flutter/flutter#115541)

* 07de108 ad3038c25 Roll Skia from 68784d303cd6 to 95ac3b53be37 (1 revision) (flutter/engine#37706) (flutter/flutter#115548)

* 1b23ad6 Roll Flutter Engine from ad3038c25cfa to 832aae2f850a (2 revisions) (flutter/flutter#115552)

* e8cbd44 Added Badge.isLabelVisible flag (flutter/flutter#115292)

* e9622ce Added Badge.count constructor (flutter/flutter#115297)

* 537f89c Revert "Added Badge.count constructor (#115297)" (flutter/flutter#115564)
johnpryan pushed a commit to Slowhand0309/packages that referenced this pull request Nov 17, 2022
* d359af2 a062a2063 [macOS] Merge FlutterMetalCompositor, superclass (flutter/engine#37648) (flutter/flutter#115474)

* cacf1d2 Roll Flutter Engine from a062a20638d1 to 97974ebb5ff8 (3 revisions) (flutter/flutter#115478)

* 490fe28 Updated instructions for adding new localized messages. (flutter/flutter#115390)

* 84357cb re-enable firebase release smoke test since infra outage is over (flutter/flutter#115402)

* f205471 Use concrete factory constructor for DomXMLHttpRequest (flutter/flutter#115094)

* 55927d8 3c83b275a [Impeller] Reland: Refactor color source resolution to use explicit factory types (flutter/engine#37677) (flutter/flutter#115482)

* 829e44d Fixed label alignment (flutter/flutter#115409)

* b579109 Roll Flutter Engine from 3c83b275a511 to 35ecb2bf4139 (2 revisions) (flutter/flutter#115495)

* d01874d [framework] re-rasterize page transition when layout size changes (flutter/flutter#115371)

* 68740a2 fee463552 Roll Fuchsia Linux SDK from T7_W8eoMNuMdG-5R9... to haqxMhaSf7-4ZeVL8... (flutter/engine#37684) (flutter/flutter#115498)

* 26a990f Roll Flutter Engine from fee463552a93 to c5e6a38dd0bc (2 revisions) (flutter/flutter#115504)

* f255390 Remove redundant arguments passed to redirecting factory constructors (flutter/flutter#115497)

* 20139c6 4f3f45617 Move windows engine_v2 to prod. (flutter/engine#37680) (flutter/flutter#115508)

* 2ad4dc5 dcdb96e9d Roll Skia from 1dfecd7cd478 to 7f385b0ae434 (9 revisions) (flutter/engine#37693) (flutter/flutter#115512)

* 9c54635 Bump codecov/codecov-action from 3.1.0 to 3.1.1 (flutter/flutter#113126)

* fafa11d Roll Flutter Engine from dcdb96e9db6b to cb403c1feaee (2 revisions) (flutter/flutter#115516)

* 59f389d Remove unneeded comparison to `double.nan` (flutter/flutter#115470)

* c071950 d422023f3 Migrate const_finder tests to be null safe (flutter/engine#37683) (flutter/flutter#115524)

* bf6d0f3 5bbf070c3 Roll Skia from 7f385b0ae434 to 8589c8ac6ee6 (1 revision) (flutter/engine#37702) (flutter/flutter#115531)

* 83d205e 7156b87c7 Roll Skia from 8589c8ac6ee6 to 68784d303cd6 (4 revisions) (flutter/engine#37705) (flutter/flutter#115538)

* 7e8568b 83c2482d7 [Impeller] Add Impeller scene (flutter/engine#37694) (flutter/flutter#115541)

* 07de108 ad3038c25 Roll Skia from 68784d303cd6 to 95ac3b53be37 (1 revision) (flutter/engine#37706) (flutter/flutter#115548)

* 1b23ad6 Roll Flutter Engine from ad3038c25cfa to 832aae2f850a (2 revisions) (flutter/flutter#115552)

* e8cbd44 Added Badge.isLabelVisible flag (flutter/flutter#115292)

* e9622ce Added Badge.count constructor (flutter/flutter#115297)

* 537f89c Revert "Added Badge.count constructor (#115297)" (flutter/flutter#115564)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants