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

Revert "[macOS] Refactor rendering infrastructure" #38332

Closed
wants to merge 1 commit into from

Conversation

CaseyHillers
Copy link
Contributor

@CaseyHillers CaseyHillers commented Dec 15, 2022

Reverts #37789

Google internal bug at b/262764490

This is causing breakages as the std calls aren't explicitly called. Relanding requires ensuring things like #include <vector are in the culprit files.

Sample of errors:

shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizer.mm:11:33: error: implicit instantiation of undefined template 'std::vector<void (^)()>'
  std::vector<dispatch_block_t> _scheduledBlocks;

shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizer.mm:36:37: error: unknown type name '_mutex'; did you mean 'std::mutex'?
  std::unique_lock<std::mutex> lock(_mutex);

shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizer.mm:38:3: error: use of undeclared identifier '_beginResizeWaiting'
  _beginResizeWaiting = YES;

@CaseyHillers
Copy link
Contributor Author

@cbracken can you help with the reland to prevent future breakages? Issue seems to be with differences in how the compilers are configured.

@cbracken
Copy link
Member

Yep - thanks for catching this!

@cbracken
Copy link
Member

@CaseyHillers Can you attach the compiler error output to help with the fix?

@CaseyHillers CaseyHillers added the autosubmit Merge PR when tree becomes green via auto submit App label Dec 15, 2022
@CaseyHillers
Copy link
Contributor Author

@cbracken I've gone ahead and added the unique errors to the description. Some of its been redacted, but I think I got the main errors included.

@knopp
Copy link
Member

knopp commented Dec 15, 2022

Looks like a missing std::vector import? I am a bit curious why it compiles at all. Precompiled headers seem to be disabled in buildroot.

@cbracken
Copy link
Member

cbracken commented Dec 15, 2022

Thanks. Probably faster for me to quick iterate on the internal roll patch (cl/495619470) to get it to compiling state rather than iterate through the chain of rollers. @knopp If you want to put together a reland patch I can add the changes or just paste the patch and you can apply it and reland.

@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Dec 15, 2022
@auto-submit
Copy link
Contributor

auto-submit bot commented Dec 15, 2022

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

@knopp
Copy link
Member

knopp commented Dec 15, 2022

Does your internal build use different libcxx version? The one included in third_party/libcxx includes vector implicitly (functional -> boyer_moore_searcher -> vector), that's why I missed it.

@CaseyHillers
Copy link
Contributor Author

@cbracken has a one line fix he's going to send

@cbracken cbracken deleted the revert-37789-macos_rendering_refactor branch December 15, 2022 23:56
@cbracken
Copy link
Member

Fixed by @knopp in #38337

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.

4 participants