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

Conversation

@jiahaog
Copy link
Member

@jiahaog jiahaog commented Sep 5, 2023

Fixes the following in G3 (b/299185514):

impeller/typographer/font_glyph_pair.h:27:27: error: no template named 'unordered_map' in namespace 'std'; did you mean 'unordered_set'?
using FontGlyphMap = std::unordered_map<ScaledFont, std::unordered_set<Glyph>>;
                     ~~~~~^

I don't really know why the lack of this import only breaks the g3 build, but not here. My guess is that it's being imported transitively in some other import that's being ifdef-ed out in g3.

But since we're already using it in

using FontGlyphMap = std::unordered_map<ScaledFont, std::unordered_set<Glyph>>;
, we probably want to use the import in this file anyway.

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.

Copy link
Contributor

@jonahwilliams jonahwilliams left a comment

Choose a reason for hiding this comment

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

Lgtm

@jiahaog jiahaog added the autosubmit Merge PR when tree becomes green via auto submit App label Sep 5, 2023
@auto-submit auto-submit bot merged commit a2f9f5e into flutter:main Sep 6, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 6, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 6, 2023
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Sep 6, 2023
…134089)

flutter/engine@5903490...8bacc3b

2023-09-06 [email protected] [Impeller] construct text frames on UI thread. (flutter/engine#45418)
2023-09-06 [email protected] Add import for `<unordered_map>` to fix the g3 build (flutter/engine#45471)
2023-09-06 [email protected] Roll Skia from af473004622f to 0a253625a76a (2 revisions) (flutter/engine#45470)
2023-09-05 [email protected] Roll Skia from 1019c10a2d38 to af473004622f (2 revisions) (flutter/engine#45469)
2023-09-05 [email protected] Adds a comment on clang_arm64_apilevel26 toolchain usage (flutter/engine#45467)

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://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
@jiahaog jiahaog deleted the import-map branch September 6, 2023 04:04
@jiahaog
Copy link
Member Author

jiahaog commented Sep 6, 2023

Thanks for the quick review :)

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

No open projects
Archived in project

Development

Successfully merging this pull request may close these issues.

2 participants