Thanks to visit codestin.com
Credit goes to github.com

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

Roll Skia to 14f8f6d984ff #57068

Merged
merged 3 commits into from
Dec 9, 2024
Merged

Roll Skia to 14f8f6d984ff #57068

merged 3 commits into from
Dec 9, 2024

Conversation

@bdero
Copy link
Member

@bdero bdero commented Dec 9, 2024 •
edited
Loading

Resolves flutter/flutter#159986.

Set args skia_use_libpng_decode=true and skia_use_rust_png_decode=false.

https://skia.googlesource.com/skia.git/+log/e78dd0265002..14f8f6d984ff

2024-12-09 [email protected] Update GN build to allow for rust PNG decoding only
2024-12-09 [email protected] [rust png] Update Skia => png dependency to version 0.17.15.
2024-12-09 [email protected] Add placeholder files for jsonreader

@skia-flutter-autoroll
Roll Skia from e78dd0265002 to 14f8f6d984ff (3 revisions)
24e7477 
https://skia.googlesource.com/skia.git/+log/e78dd0265002..14f8f6d984ff

2024-12-09 [email protected] Update GN build to allow for rust PNG decoding only
2024-12-09 [email protected] [rust png] Update Skia => `png` dependency to version 0.17.15.
2024-12-09 [email protected] Add placeholder files for jsonreader

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/skia-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 Skia: https://bugs.chromium.org/p/skia/issues/entry
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
@bdero bdero mentioned this pull request Dec 9, 2024
Closed
@jason-simmons
Copy link
Member

jason-simmons commented Dec 9, 2024

The engine's copy of the Skia build rules in https://github.com/flutter/engine/tree/main/skia may also need to port over some of the #defines added in places like https://skia.googlesource.com/skia.git/+/14f8f6d984ff23bed1f9ae7acf98be683eccaeac%5E%21/#F0

@bdero bdero force-pushed the skia_roll_14f8f6d984ff branch from 177ec6d to aec1400 Compare December 9, 2024 18:36
@bdero
Copy link
Member Author

bdero commented Dec 9, 2024

The engine's copy of the Skia build rules in https://github.com/flutter/engine/tree/main/skia may also need to port over some of the #defines added in places like https://skia.googlesource.com/skia.git/+/14f8f6d984ff23bed1f9ae7acf98be683eccaeac%5E%21/#F0

Ah good call, porting the changes over.

@bdero
Copy link
Member Author

bdero commented Dec 9, 2024

I ported the build rules and ImageDecoderNoGLTest.ImpellerUnmultipliedAlphaPng is now passing locally, so hopefully we're good to go.

@bdero bdero marked this pull request as ready for review December 9, 2024 18:57
@flutter-dashboard
Copy link

flutter-dashboard bot commented Dec 9, 2024

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption, contact "@test-exemption-reviewer" in the #hackers channel in Discord (don't just cc them here, they won't see it!).

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. The test exemption team is a small volunteer group, so all reviewers should feel empowered to ask for tests, without delegating that responsibility entirely to the test exemption group.

@zanderso
Copy link
Member

zanderso commented Dec 9, 2024

FYI @kjlubick

@kjlubick
Copy link
Contributor

kjlubick commented Dec 9, 2024

I had thought I set things up to land and roll cleanly.

I'm guessing Flutter is (somewhere) still dependent on the legacy registration of codecs (https://skia-review.googlesource.com/c/skia/+/926096/14/src/codec/SkCodec.cpp). We should fix that to prevent issues like this from happening (and making the dependencies more explicit).

@kjlubick
Copy link
Contributor

kjlubick commented Dec 9, 2024

Ah, I think it's simply this:

engine/lib/ui/painting/image_decoder_no_gl_unittests.cc

Line 205 in a8c08bc

auto image = SkImages::DeferredFromEncodedData(data);

That should probably use SkPngDecoder::Decode explicitly and directly.

@kjlubick kjlubick assigned kjlubick and unassigned kjlubick Dec 9, 2024
@kjlubick kjlubick self-requested a review December 9, 2024 20:22
@bdero bdero added the autosubmit Merge PR when tree becomes green via auto submit App label Dec 9, 2024
@auto-submit auto-submit bot merged commit 597d726 into flutter:main Dec 9, 2024
36 checks passed
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Dec 9, 2024
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 9, 2024
@engine-flutter-autoroll
597d726c3 Roll Skia to 14f8f6d984ff (flutter/engine#57068)
3db890e
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Dec 9, 2024
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 9, 2024
@engine-flutter-autoroll
597d726c3 Roll Skia to 14f8f6d984ff (flutter/engine#57068)
012dd97
github-merge-queue bot pushed a commit to flutter/flutter that referenced this pull request Dec 9, 2024
@engine-flutter-autoroll
Roll Flutter Engine from 37a7a144b864 to 4d0e9ac8f5ae (3 revisions) (#…
6a019d2 
…160000)

flutter/engine@37a7a14...4d0e9ac

2024-12-09 [email protected] [Impeller] switch Pipeline to use
raw ptr instead of shared ptr for recorded references.
(flutter/engine#57015)
2024-12-09 [email protected] [Impeller] disable all Adrenos older
than 630 (flutter/engine#57069)
2024-12-09 [email protected] Roll Skia to 14f8f6d984ff
(flutter/engine#57068)

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://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
nick9822 pushed a commit to nick9822/flutter that referenced this pull request Dec 18, 2024
@bdero
Roll Skia to 14f8f6d984ff (flutter/engine#57068)
4b87db5 
Resolves flutter/engine#57068.

Set args `skia_use_libpng_decode=true` and `skia_use_rust_png_decode=false`.

https://skia.googlesource.com/skia.git/+log/e78dd0265002..14f8f6d984ff

2024-12-09 [email protected] Update GN build to allow for rust PNG decoding only
2024-12-09 [email protected] [rust png] Update Skia => `png` dependency to version 0.17.15.
2024-12-09 [email protected] Add placeholder files for jsonreader
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@zanderso zanderso Awaiting requested review from zanderso

@jason-simmons jason-simmons Awaiting requested review from jason-simmons

1 more reviewer

@kjlubick kjlubick kjlubick approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

autosubmit Merge PR when tree becomes green via auto submit App

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Skia roll blocked on PNG decoder test failures

5 participants

@bdero @jason-simmons @zanderso @kjlubick @skia-flutter-autoroll