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

[web] fix ==/hashCode/toString for several classes across renderers #49786

Merged
merged 4 commits into from
Jan 18, 2024

Conversation

yjbanov
Copy link
Contributor

@yjbanov yjbanov commented Jan 14, 2024

Fix equality and hash code in ParagraphStyle and StrutStyle across renderers. Since those classes transitively rely on Paint and other classes, also fix those at least to a point that they pass the test/painting/text_style_test.dart test on the framework side.

@github-actions github-actions bot added the platform-web Code specifically for the web engine label Jan 14, 2024
@yjbanov yjbanov marked this pull request as ready for review January 16, 2024 23:14
@yjbanov yjbanov changed the title [web] fix ParagraphStyle and StrutStyle ==/hashCode across renderers [web] fix ==/hashCode/toString for several classes across renderers Jan 16, 2024
Copy link
Contributor

@harryterkelsen harryterkelsen left a comment

Choose a reason for hiding this comment

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

LGTM

yjbanov added a commit to yjbanov/flutter that referenced this pull request Jan 17, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Jan 17, 2024
Skip incorrect expectations in preparation for flutter/engine#49786.

Bonus: improved error message when text style test fails
yjbanov added a commit to yjbanov/flutter that referenced this pull request Jan 17, 2024
yjbanov added a commit to flutter/flutter that referenced this pull request Jan 18, 2024
This disables the expectation for `TileMode` stringification because
flutter/engine#49786 is about to fix it (as in,
the test would fail when the engine fix lands).
@yjbanov yjbanov added the autosubmit Merge PR when tree becomes green via auto submit App label Jan 18, 2024
@auto-submit auto-submit bot merged commit 924c172 into flutter:main Jan 18, 2024
27 checks passed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 18, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Jan 18, 2024
…141749)

flutter/engine@98c16b4...924c172

2024-01-18 [email protected] [web] fix ==/hashCode/toString for several classes across renderers (flutter/engine#49786)

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],[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
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 18, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 18, 2024
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Jan 18, 2024
flutter/flutter@def6af0...f77f824

2024-01-18 [email protected] Roll Flutter Engine from 49fa2cb9024f to b75d6d80d813 (1 revision) (flutter/flutter#141771)
2024-01-18 [email protected] Roll Flutter Engine from 49c6ca211aa4 to 49fa2cb9024f (1 revision) (flutter/flutter#141762)
2024-01-18 [email protected] Roll Flutter Engine from 873449c27d5a to 49c6ca211aa4 (1 revision) (flutter/flutter#141760)
2024-01-18 [email protected] Roll Flutter Engine from bfdc0c5b2826 to 873449c27d5a (1 revision) (flutter/flutter#141759)
2024-01-18 [email protected] Catch UnsupportedError thrown when user provides an asset directory path containing invalid characters (flutter/flutter#141214)
2024-01-18 [email protected] Roll Flutter Engine from 48f89ac064ac to bfdc0c5b2826 (1 revision) (flutter/flutter#141752)
2024-01-18 [email protected] Roll Flutter Engine from 924c17245a78 to 48f89ac064ac (2 revisions) (flutter/flutter#141751)
2024-01-18 [email protected] Roll Flutter Engine from 98c16b430e6b to 924c17245a78 (1 revision) (flutter/flutter#141749)
2024-01-18 [email protected] Roll Flutter Engine from 73a2de5da53f to 98c16b430e6b (16 revisions) (flutter/flutter#141744)
2024-01-18 [email protected] Move mac pixel 7 pro test to presubmit: false (flutter/flutter#141747)
2024-01-18 [email protected] [web] prepare layers_test.dart for flutter/engine#49786 (flutter/flutter#141731)
2024-01-17 [email protected] Remove non-needed bot and increase time out for leak_tracking. (flutter/flutter#141712)
2024-01-17 36861262 [email protected] Add `headerHeight` for `SearchAnchor` (flutter/flutter#141223)
2024-01-17 49699333 dependabot[bot]@users.noreply.github.com Bump github/codeql-action from 3.23.0 to 3.23.1 (flutter/flutter#141715)
2024-01-17 [email protected] Make test file systems/platforms used in asset_bundle_test.dart less dependent on the host platform (flutter/flutter#141657)
2024-01-17 [email protected] Native assets: roll deps (flutter/flutter#141684)
2024-01-17 [email protected] Run build tests on both x64 and arm64. (flutter/flutter#141206)
2024-01-17 15619084 [email protected] Update tests to Xcode 15 (flutter/flutter#141706)
2024-01-17 [email protected] [web] prepare for flutter/engine#49786 (flutter/flutter#141700)
2024-01-17 [email protected] Marks Windows framework_tests_misc_leak_tracking to be unflaky (flutter/flutter#141676)
2024-01-17 [email protected] Label "flutter_localizations" PRs with "framework" (flutter/flutter#141654)
2024-01-17 31859944 [email protected] Fix Tooltip show delay when mouse moves to one Tooltip from another (flutter/flutter#141656)
2024-01-17 [email protected] Roll Packages from 7dd0fcb to 1a2b780 (6 revisions) (flutter/flutter#141683)
2024-01-17 [email protected] Fix the --empty flag to not try working with non-app templates (flutter/flutter#141632)
2024-01-17 [email protected] Revert "Roll Flutter Engine from 73a2de5da53f to c7e328518bc0 (5 revisions)" (flutter/flutter#141691)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages
Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: 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
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Jan 18, 2024
- Unskip `text_style_test` for CanvasKit.
- Remove no longer necessary `kIsWeb` checks in a few tests.

This PR depends on flutter/engine#49786, which rolled into the framework. If the engine PR needs to be reverted, this PR will need to be reverted too.
arc-yong pushed a commit to Arctuition/packages-arc that referenced this pull request Jun 14, 2024
flutter/flutter@def6af0...f77f824

2024-01-18 [email protected] Roll Flutter Engine from 49fa2cb9024f to b75d6d80d813 (1 revision) (flutter/flutter#141771)
2024-01-18 [email protected] Roll Flutter Engine from 49c6ca211aa4 to 49fa2cb9024f (1 revision) (flutter/flutter#141762)
2024-01-18 [email protected] Roll Flutter Engine from 873449c27d5a to 49c6ca211aa4 (1 revision) (flutter/flutter#141760)
2024-01-18 [email protected] Roll Flutter Engine from bfdc0c5b2826 to 873449c27d5a (1 revision) (flutter/flutter#141759)
2024-01-18 [email protected] Catch UnsupportedError thrown when user provides an asset directory path containing invalid characters (flutter/flutter#141214)
2024-01-18 [email protected] Roll Flutter Engine from 48f89ac064ac to bfdc0c5b2826 (1 revision) (flutter/flutter#141752)
2024-01-18 [email protected] Roll Flutter Engine from 924c17245a78 to 48f89ac064ac (2 revisions) (flutter/flutter#141751)
2024-01-18 [email protected] Roll Flutter Engine from 98c16b430e6b to 924c17245a78 (1 revision) (flutter/flutter#141749)
2024-01-18 [email protected] Roll Flutter Engine from 73a2de5da53f to 98c16b430e6b (16 revisions) (flutter/flutter#141744)
2024-01-18 [email protected] Move mac pixel 7 pro test to presubmit: false (flutter/flutter#141747)
2024-01-18 [email protected] [web] prepare layers_test.dart for flutter/engine#49786 (flutter/flutter#141731)
2024-01-17 [email protected] Remove non-needed bot and increase time out for leak_tracking. (flutter/flutter#141712)
2024-01-17 36861262 [email protected] Add `headerHeight` for `SearchAnchor` (flutter/flutter#141223)
2024-01-17 49699333 dependabot[bot]@users.noreply.github.com Bump github/codeql-action from 3.23.0 to 3.23.1 (flutter/flutter#141715)
2024-01-17 [email protected] Make test file systems/platforms used in asset_bundle_test.dart less dependent on the host platform (flutter/flutter#141657)
2024-01-17 [email protected] Native assets: roll deps (flutter/flutter#141684)
2024-01-17 [email protected] Run build tests on both x64 and arm64. (flutter/flutter#141206)
2024-01-17 15619084 [email protected] Update tests to Xcode 15 (flutter/flutter#141706)
2024-01-17 [email protected] [web] prepare for flutter/engine#49786 (flutter/flutter#141700)
2024-01-17 [email protected] Marks Windows framework_tests_misc_leak_tracking to be unflaky (flutter/flutter#141676)
2024-01-17 [email protected] Label "flutter_localizations" PRs with "framework" (flutter/flutter#141654)
2024-01-17 31859944 [email protected] Fix Tooltip show delay when mouse moves to one Tooltip from another (flutter/flutter#141656)
2024-01-17 [email protected] Roll Packages from 7dd0fcb to 1a2b780 (6 revisions) (flutter/flutter#141683)
2024-01-17 [email protected] Fix the --empty flag to not try working with non-app templates (flutter/flutter#141632)
2024-01-17 [email protected] Revert "Roll Flutter Engine from 73a2de5da53f to c7e328518bc0 (5 revisions)" (flutter/flutter#141691)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages
Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: 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
autosubmit Merge PR when tree becomes green via auto submit App platform-web Code specifically for the web engine
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants