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

Re-enable the Wuffs GIF decoder #9466

Merged
merged 1 commit into from
Jul 10, 2019
Merged

Re-enable the Wuffs GIF decoder #9466

merged 1 commit into from
Jul 10, 2019

Conversation

jason-simmons
Copy link
Member

@jason-simmons jason-simmons force-pushed the wuffs_enable_0618 branch 4 times, most recently from 2b2e910 to 448655e Compare June 26, 2019 00:19
@jason-simmons jason-simmons merged commit f775f5e into flutter:master Jul 10, 2019
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jul 10, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 10, 2019
@engine-flutter-autoroll
f775f5e Re-enable the Wuffs GIF decoder (flutter/engine#9466)
5d5e24a
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jul 11, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 11, 2019
@engine-flutter-autoroll
f775f5e Re-enable the Wuffs GIF decoder (flutter/engine#9466)
43b23cc
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 11, 2019
@engine-flutter-autoroll
f775f5e Re-enable the Wuffs GIF decoder (flutter/engine#9466)
55a10e1
This was referenced Jul 11, 2019
Closed
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 11, 2019
@engine-flutter-autoroll
f775f5e Re-enable the Wuffs GIF decoder (flutter/engine#9466)
4e89ba9
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jul 11, 2019
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 11, 2019
@engine-flutter-autoroll
f775f5e Re-enable the Wuffs GIF decoder (flutter/engine#9466)
0b25270
engine-flutter-autoroll added a commit to flutter/flutter that referenced this pull request Jul 11, 2019
@engine-flutter-autoroll
Roll engine 75387db..49445ce (32 commits) (#35952)
b69feb5 
flutter/engine@75387db...49445ce

git log 75387db..49445ce --no-merges --oneline
49445ce FLEViewController/Engine API changes (flutter/engine#9750)
2a79462 Add Fuchsia build CI presubmit steps (flutter/engine#9736)
67cebdb Roll fuchsia/sdk/core/linux-amd64 from KGmm_RIJoXS19zTm2crjM3RYpmp5Y03-fLUeVdylbTYC to ehWVT9QJbC-vFMM6SkkQM9HJ9oITFCws7FC9JnrFq2gC (flutter/engine#9765)
089c740 Roll fuchsia/sdk/core/mac-amd64 from lCQWEeR_Ert7t_qAbMRycwrRyZC-dIprYPyPJzwPmg4C to EYnRdXFT9l-d8Qkz4zeTRXnqfV3KQzpQhoPs1r0-740C (flutter/engine#9759)
b22410e Include SkParagraph headers only when the enable-skshaper flag is on (flutter/engine#9758)
2cd650d Minimal integration with the Skia text shaper module (flutter/engine#9556)
f775f5e Re-enable the Wuffs GIF decoder (flutter/engine#9466)
aca0482 Make all shell unit tests use the OpenGL rasterizer. (flutter/engine#9746)
bc57291 Make FLEViewController's view an internal detail (flutter/engine#9741)
9776043 Synchronize main thread and gpu thread for first render frame (flutter/engine#9506)
f600ae8 Use libc++ variant of string view and remove the FML variant. (flutter/engine#9737)
564f53f Revert "Improve caching limits for Skia (#9503)" (flutter/engine#9740)
b453d3c libtxt: fix reference counting of SkFontStyleSets held by font asset providers (flutter/engine#9561)
fa7627d Fix backspace crash on Chinese devices (flutter/engine#9734)
56885f7 Let pushColorFilter accept all types of ColorFilters (flutter/engine#9641)
6dccb21 Roll src/third_party/skia 96fdfe0fe88e..af4e7b6cf616 (1 commits) (flutter/engine#9735)
8511d9b Roll fuchsia/sdk/core/mac-amd64 from byM-kyxL4bemlTYNqhKUfJfZoIUrCSzS6XzsFr4n9-MC to lCQWEeR_Ert7t_qAbMRycwrRyZC-dIprYPyPJzwPmg4C (flutter/engine#9742)
b3bf0a1 Roll fuchsia/sdk/core/linux-amd64 from I2Qe1zxgckzIzMBTztvzeWYsDgcb9Fw-idSI16oIlx8C to KGmm_RIJoXS19zTm2crjM3RYpmp5Y03-fLUeVdylbTYC (flutter/engine#9743)
7e56823 Fix windows test by not attempting to open a directory as a file. (flutter/engine#9745)
6cf0d13 Roll src/third_party/skia a3ffaabcc4f2..96fdfe0fe88e (5 commits) (flutter/engine#9731)
49a00ae Fix Fuchsia build. (flutter/engine#9730)
b3bb39b Roll src/third_party/dart 06c3d7ad3a...09fc76bc51 (flutter/engine#9728)
2284210 Make the license script compatible with recently changed Dart I/O stream APIs (flutter/engine#9725)
ad582b5 Rework image & texture management to use concurrent message queues. (flutter/engine#9486)
1dcd5f5 Roll src/third_party/skia 6b82cf638682..a3ffaabcc4f2 (24 commits) (flutter/engine#9726)
129979c Revert "Roll src/third_party/dart 06c3d7ad3a..7acecda2cc (12 commits)" (flutter/engine#9724)
8020d7e Roll src/third_party/skia 56065d9b875f..6b82cf638682 (3 commits) (flutter/engine#9718)
e24bd78 Roll src/third_party/dart 06c3d7ad3a..7acecda2cc (12 commits)
3d2668c Reland isolate group changes
802bd15 iOS platform view opacity (flutter/engine#9667)
3b6265b Roll src/third_party/dart b5aeaa6796..06c3d7ad3a (44 commits)
887e052 Refactor ColorFilter to have a native wrapper (flutter/engine#9668)

The AutoRoll server is located here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff ([email protected]), and stop
the roller if necessary.
@LeonScroggins
Copy link
Contributor

@nigeltao just updated the version of Wuffs that Skia uses, which broke the Skia roll, because SkWuffsCodec.cpp has a preprocessor line that enforces using the latest (or at least a recent) version of Wuffs. I've reverted for now, but @jason-simmons, can you update your Wuffs so that we can reland?

(Also, should we learn how to update flutter's Wuffs so we can avoid this issue in the future?)

@jason-simmons
Copy link
Member Author

Flutter is taking its version of Wuffs from https://fuchsia.googlesource.com/third_party/wuffs/

Updating it involves doing a merge of the appropriate Wuffs commit into that repository:
https://fuchsia-review.googlesource.com/c/third_party/wuffs/+/300278

And then updating the Flutter engine's DEPS to point at the merge commit.

@jason-simmons
Copy link
Member Author

Another option would be moving the Flutter Wuffs BUILD.gn file into build/secondary/third_party and then having Flutter's DEPS use the same Wuffs URL as Skia's DEPS.

This would simplify Skia->Flutter rolls. Would it cause any issues for Flutter->Fuchsia rolls?

@chinmaygarde

@jason-simmons
Copy link
Member Author

Moved the build script into build/secondary and rolled Wuffs to the version that Skia will be using:
bcde838

It should be safe to roll Wuffs forward in the Skia tree now.

@LeonScroggins
Copy link
Contributor

Thanks!

@nigeltao
Copy link

Thanks for fixing.

In the future, what's the recommended process or ordering (for Skia, Flutter, and Fuchsia updates), if I want to once again upgrade the Wuffs version that Skia uses? It's still a manual process, similar to bcde838, right?

Is the easiest thing just to CC you on Skia CLs like https://skia-review.googlesource.com/c/skia/+/226476

@jason-simmons
Copy link
Member Author

The Wuffs commit in Flutter's DEPS will need to be updated to match the commit in Skia's DEPS:
https://github.com/flutter/engine/blob/master/DEPS#L393

For now, you can CC me on updates. Eventually it should be possible to automatically apply these changes in the Skia->Flutter roller.

@nigeltao
Copy link

Making a 1-liner change to Flutter's DEPS sounds easy. Does Flutter use GitHub PRs or does it use some other code review process (e.g. Gerrit)?

@jason-simmons
Copy link
Member Author

We use GitHub PRs: https://github.com/flutter/engine/pulls

@nigeltao
Copy link

A tangential question: https://github.com/flutter/engine/blob/master/DEPS#L393 starts with Var('skia_git'). Should we change skia_git to github_git and cut out the middleman, since the canonical Wuffs repository is on GitHub: https://github.com/google/wuffs

@jason-simmons
Copy link
Member Author

Either is fine. I used skia_git so that the URL that Flutter pulls from would exactly match the URL used by Skia. But if Skia's repository is just a mirror then we could just pull from the original.

@nigeltao
Copy link

OK, I'll leave it as is.

johnsonmh pushed a commit to johnsonmh/flutter that referenced this pull request Jul 30, 2019
@engine-flutter-autoroll @johnsonmh
Roll engine 75387db..49445ce (32 commits) (flutter#35952)
8c017b8 
flutter/engine@75387db...49445ce

git log 75387db..49445ce --no-merges --oneline
49445ce FLEViewController/Engine API changes (flutter/engine#9750)
2a79462 Add Fuchsia build CI presubmit steps (flutter/engine#9736)
67cebdb Roll fuchsia/sdk/core/linux-amd64 from KGmm_RIJoXS19zTm2crjM3RYpmp5Y03-fLUeVdylbTYC to ehWVT9QJbC-vFMM6SkkQM9HJ9oITFCws7FC9JnrFq2gC (flutter/engine#9765)
089c740 Roll fuchsia/sdk/core/mac-amd64 from lCQWEeR_Ert7t_qAbMRycwrRyZC-dIprYPyPJzwPmg4C to EYnRdXFT9l-d8Qkz4zeTRXnqfV3KQzpQhoPs1r0-740C (flutter/engine#9759)
b22410e Include SkParagraph headers only when the enable-skshaper flag is on (flutter/engine#9758)
2cd650d Minimal integration with the Skia text shaper module (flutter/engine#9556)
f775f5e Re-enable the Wuffs GIF decoder (flutter/engine#9466)
aca0482 Make all shell unit tests use the OpenGL rasterizer. (flutter/engine#9746)
bc57291 Make FLEViewController&flutter#39;s view an internal detail (flutter/engine#9741)
9776043 Synchronize main thread and gpu thread for first render frame (flutter/engine#9506)
f600ae8 Use libc&flutter#43;&flutter#43; variant of string view and remove the FML variant. (flutter/engine#9737)
564f53f Revert &flutter#34;Improve caching limits for Skia (flutter#9503)&flutter#34; (flutter/engine#9740)
b453d3c libtxt: fix reference counting of SkFontStyleSets held by font asset providers (flutter/engine#9561)
fa7627d Fix backspace crash on Chinese devices (flutter/engine#9734)
56885f7 Let pushColorFilter accept all types of ColorFilters (flutter/engine#9641)
6dccb21 Roll src/third_party/skia 96fdfe0fe88e..af4e7b6cf616 (1 commits) (flutter/engine#9735)
8511d9b Roll fuchsia/sdk/core/mac-amd64 from byM-kyxL4bemlTYNqhKUfJfZoIUrCSzS6XzsFr4n9-MC to lCQWEeR_Ert7t_qAbMRycwrRyZC-dIprYPyPJzwPmg4C (flutter/engine#9742)
b3bf0a1 Roll fuchsia/sdk/core/linux-amd64 from I2Qe1zxgckzIzMBTztvzeWYsDgcb9Fw-idSI16oIlx8C to KGmm_RIJoXS19zTm2crjM3RYpmp5Y03-fLUeVdylbTYC (flutter/engine#9743)
7e56823 Fix windows test by not attempting to open a directory as a file. (flutter/engine#9745)
6cf0d13 Roll src/third_party/skia a3ffaabcc4f2..96fdfe0fe88e (5 commits) (flutter/engine#9731)
49a00ae Fix Fuchsia build. (flutter/engine#9730)
b3bb39b Roll src/third_party/dart 06c3d7ad3a...09fc76bc51 (flutter/engine#9728)
2284210 Make the license script compatible with recently changed Dart I/O stream APIs (flutter/engine#9725)
ad582b5 Rework image & texture management to use concurrent message queues. (flutter/engine#9486)
1dcd5f5 Roll src/third_party/skia 6b82cf638682..a3ffaabcc4f2 (24 commits) (flutter/engine#9726)
129979c Revert &flutter#34;Roll src/third_party/dart 06c3d7ad3a..7acecda2cc (12 commits)&flutter#34; (flutter/engine#9724)
8020d7e Roll src/third_party/skia 56065d9b875f..6b82cf638682 (3 commits) (flutter/engine#9718)
e24bd78 Roll src/third_party/dart 06c3d7ad3a..7acecda2cc (12 commits)
3d2668c Reland isolate group changes
802bd15 iOS platform view opacity (flutter/engine#9667)
3b6265b Roll src/third_party/dart b5aeaa6796..06c3d7ad3a (44 commits)
887e052 Refactor ColorFilter to have a native wrapper (flutter/engine#9668)

The AutoRoll server is located here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff ([email protected]), and stop
the roller if necessary.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@chinmaygarde chinmaygarde chinmaygarde approved these changes

Assignees
No one assigned
Labels
cla: yes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Please switch to new Wuffs decoder in Skia
5 participants
@jason-simmons @LeonScroggins @nigeltao @chinmaygarde @googlebot