Skip to content

Manual roll Skia from 39aa2a70213a to 9a983f6c2c06#181986

Merged
auto-submit[bot] merged 2 commits into
flutter:masterfrom
jason-simmons:roll_skia_020526
Feb 6, 2026
Merged

Manual roll Skia from 39aa2a70213a to 9a983f6c2c06#181986
auto-submit[bot] merged 2 commits into
flutter:masterfrom
jason-simmons:roll_skia_020526

Conversation

@jason-simmons

Copy link
Copy Markdown
Member

Includes updates for the renaming of SkDebug to SkLog

Includes updates for the renaming of SkDebug to SkLog
@github-actions github-actions Bot added the engine flutter/engine related. See also e: labels. label Feb 6, 2026

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Code Review

This pull request is a manual roll of the Skia dependency. The changes in engine/src/flutter/skia/BUILD.gn reflect the renaming of SkDebug to SkLog in the upstream Skia repository, replacing SkDebug_*.cpp source files with their SkLog_*.cpp counterparts.


if (is_linux || is_wasm || is_qnx) {
sources += [ "$_skia_root/src/ports/SkDebug_stdio.cpp" ]
sources += [ "$_skia_root/src/ports/SkLog_stdio.cpp" ]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

medium

While this change is correct, $_skia_root/src/ports/SkLog_stdio.cpp is now added in four separate platform-specific blocks (for linux/wasm/qnx on this line, mac on L754, ios on L766, and fuchsia on L776). This duplicates the logic.

To improve maintainability and reduce duplication, consider consolidating the addition of this file. Since this file is used for all platforms except Windows and Android, you could add it once with a condition like:

if (!is_win && !is_android) {
  sources += [ "$_skia_root/src/ports/SkLog_stdio.cpp" ]
}

This would require removing the additions from the individual if blocks.

References
  1. Adding the same source file in multiple conditional blocks creates duplication, which makes the code harder to read and maintain. This is contrary to the style guide's emphasis on readability and avoiding duplication (lines 29-30). (link)

@jason-simmons jason-simmons added the autosubmit Merge PR when tree becomes green via auto submit App label Feb 6, 2026
@auto-submit auto-submit Bot added this pull request to the merge queue Feb 6, 2026
Merged via the queue into flutter:master with commit 3e015d2 Feb 6, 2026
183 checks passed
@flutter-dashboard flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Feb 6, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 7, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 7, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 8, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 8, 2026
auto-submit Bot pushed a commit to flutter/packages that referenced this pull request Feb 8, 2026
Roll Flutter from f916dd6887bf to e8f9dc50356d (34 revisions)

flutter/flutter@f916dd6...e8f9dc5

2026-02-08 engine-flutter-autoroll@skia.org Roll Skia from 9325111e6ee4 to b7db9f35f0f2 (1 revision) (flutter/flutter#182062)
2026-02-08 engine-flutter-autoroll@skia.org Roll Skia from 3167229206b5 to 9325111e6ee4 (1 revision) (flutter/flutter#182061)
2026-02-08 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from sYqpDF9l9-kldd9_Q... to iqtwdXlgKIyZkL5Li... (flutter/flutter#182058)
2026-02-08 engine-flutter-autoroll@skia.org Roll Skia from ae78024b261e to 3167229206b5 (1 revision) (flutter/flutter#182055)
2026-02-07 engine-flutter-autoroll@skia.org Roll Dart SDK from ad6368edbe02 to 965b51c219d3 (1 revision) (flutter/flutter#182050)
2026-02-07 engine-flutter-autoroll@skia.org Roll Skia from a471f253b941 to ae78024b261e (1 revision) (flutter/flutter#182049)
2026-02-07 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from IOzzhWfhdzhu3zHsz... to sYqpDF9l9-kldd9_Q... (flutter/flutter#182043)
2026-02-07 engine-flutter-autoroll@skia.org Roll Dart SDK from 02092faa97c5 to ad6368edbe02 (2 revisions) (flutter/flutter#182040)
2026-02-07 engine-flutter-autoroll@skia.org Roll Skia from 9a983f6c2c06 to a471f253b941 (24 revisions) (flutter/flutter#182039)
2026-02-07 30870216+gaaclarke@users.noreply.github.com Add buffer around rerasterized input to fragment shaders to maintain coordinate space when clipped (flutter/flutter#181743)
2026-02-07 737941+loic-sharma@users.noreply.github.com Update Flutter's style guide for dot shorthands and extension methods (flutter/flutter#181934)
2026-02-06 jason-simmons@users.noreply.github.com Manual roll Skia from 39aa2a70213a to 9a983f6c2c06 (flutter/flutter#181986)
2026-02-06 47866232+chunhtai@users.noreply.github.com Update doc in foundation to match the style guide (flutter/flutter#181972)
2026-02-06 engine-flutter-autoroll@skia.org Roll Dart SDK from ec674bdb3ae4 to 02092faa97c5 (11 revisions) (flutter/flutter#182017)
2026-02-06 engine-flutter-autoroll@skia.org Roll Packages from c197455 to 7805d3e (4 revisions) (flutter/flutter#182016)
2026-02-06 98614782+auto-submit[bot]@users.noreply.github.com Reverts "[cupertino.dart] Implement CupertinoMenuAnchor and CupertinoMenuItem using RawMenuAnchor (#174695)" (flutter/flutter#182010)
2026-02-06 iinozemtsev@google.com Update Dart SDK to 3.12 beta1 (flutter/flutter#181948)
2026-02-06 59215665+davidhicks980@users.noreply.github.com [cupertino.dart] Implement CupertinoMenuAnchor and CupertinoMenuItem using RawMenuAnchor (flutter/flutter#174695)
2026-02-06 116356835+AbdeMohlbi@users.noreply.github.com `flutter_tool` : Remove redundant enum types inside the enum definition scope (flutter/flutter#181910)
2026-02-06 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#181973)
2026-02-05 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from J2QdLcY2gyt4NP_xV... to IOzzhWfhdzhu3zHsz... (flutter/flutter#181971)
2026-02-05 sstrickl@google.com Directly generate a Mach-O dynamic library using gen_snapshot. [reland] (flutter/flutter#181539)
2026-02-05 matej.knopp@gmail.com macOS: Implement tooltip window controller (flutter/flutter#180895)
2026-02-05 victorsanniay@gmail.com Constrain RawAutocomplete options by soft keyboard (flutter/flutter#181930)
2026-02-05 engine-flutter-autoroll@skia.org Roll Skia from 079d092f49e6 to 39aa2a70213a (1 revision) (flutter/flutter#181970)
2026-02-05 285025525@qq.com perf: web ui loadFontFromList (flutter/flutter#181440)
2026-02-05 vs.ashoknarayan@gmail.com Improve accessibility contrast for pre-test message (flutter/flutter#180469)
2026-02-05 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#181965)
2026-02-05 engine-flutter-autoroll@skia.org Roll Skia from 8543ce512d5c to 079d092f49e6 (8 revisions) (flutter/flutter#181964)
2026-02-05 50643541+Mairramer@users.noreply.github.com Add `clearError` API to Form and FormFieldState (flutter/flutter#180752)
2026-02-05 okorohelijah@google.com Bump minimum required Xcode version to 15 and recommended to 16 (flutter/flutter#180531)
2026-02-05 GiancarloCante@gmail.com Rename "widgetTester" parameter to "tester" in "WidgetTesterCallback" (flutter/flutter#180944)
2026-02-05 engine-flutter-autoroll@skia.org Roll Packages from 3bddf2c to c197455 (3 revisions) (flutter/flutter#181962)
2026-02-05 jason-simmons@users.noreply.github.com Temporarily remove the Pixel 9/API 36 device from the Firebase Test Lab tests. (flutter/flutter#181956)

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 stuartmorgan@google.com 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

...
flutter-zl pushed a commit to flutter-zl/flutter that referenced this pull request Feb 10, 2026
Includes updates for the renaming of SkDebug to SkLog
rickhohler pushed a commit to rickhohler/flutter that referenced this pull request Feb 19, 2026
Includes updates for the renaming of SkDebug to SkLog
reidbaker pushed a commit to reidbaker/flutter-work that referenced this pull request Feb 25, 2026
Includes updates for the renaming of SkDebug to SkLog
mboetger pushed a commit to mboetger/flutter that referenced this pull request Mar 26, 2026
Includes updates for the renaming of SkDebug to SkLog
creatorpiyush pushed a commit to creatorpiyush/packages that referenced this pull request Jun 10, 2026
…r#10979)

Roll Flutter from f916dd6887bf to e8f9dc50356d (34 revisions)

flutter/flutter@f916dd6...e8f9dc5

2026-02-08 engine-flutter-autoroll@skia.org Roll Skia from 9325111e6ee4 to b7db9f35f0f2 (1 revision) (flutter/flutter#182062)
2026-02-08 engine-flutter-autoroll@skia.org Roll Skia from 3167229206b5 to 9325111e6ee4 (1 revision) (flutter/flutter#182061)
2026-02-08 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from sYqpDF9l9-kldd9_Q... to iqtwdXlgKIyZkL5Li... (flutter/flutter#182058)
2026-02-08 engine-flutter-autoroll@skia.org Roll Skia from ae78024b261e to 3167229206b5 (1 revision) (flutter/flutter#182055)
2026-02-07 engine-flutter-autoroll@skia.org Roll Dart SDK from ad6368edbe02 to 965b51c219d3 (1 revision) (flutter/flutter#182050)
2026-02-07 engine-flutter-autoroll@skia.org Roll Skia from a471f253b941 to ae78024b261e (1 revision) (flutter/flutter#182049)
2026-02-07 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from IOzzhWfhdzhu3zHsz... to sYqpDF9l9-kldd9_Q... (flutter/flutter#182043)
2026-02-07 engine-flutter-autoroll@skia.org Roll Dart SDK from 02092faa97c5 to ad6368edbe02 (2 revisions) (flutter/flutter#182040)
2026-02-07 engine-flutter-autoroll@skia.org Roll Skia from 9a983f6c2c06 to a471f253b941 (24 revisions) (flutter/flutter#182039)
2026-02-07 30870216+gaaclarke@users.noreply.github.com Add buffer around rerasterized input to fragment shaders to maintain coordinate space when clipped (flutter/flutter#181743)
2026-02-07 737941+loic-sharma@users.noreply.github.com Update Flutter's style guide for dot shorthands and extension methods (flutter/flutter#181934)
2026-02-06 jason-simmons@users.noreply.github.com Manual roll Skia from 39aa2a70213a to 9a983f6c2c06 (flutter/flutter#181986)
2026-02-06 47866232+chunhtai@users.noreply.github.com Update doc in foundation to match the style guide (flutter/flutter#181972)
2026-02-06 engine-flutter-autoroll@skia.org Roll Dart SDK from ec674bdb3ae4 to 02092faa97c5 (11 revisions) (flutter/flutter#182017)
2026-02-06 engine-flutter-autoroll@skia.org Roll Packages from c197455 to 7805d3e (4 revisions) (flutter/flutter#182016)
2026-02-06 98614782+auto-submit[bot]@users.noreply.github.com Reverts "[cupertino.dart] Implement CupertinoMenuAnchor and CupertinoMenuItem using RawMenuAnchor (#174695)" (flutter/flutter#182010)
2026-02-06 iinozemtsev@google.com Update Dart SDK to 3.12 beta1 (flutter/flutter#181948)
2026-02-06 59215665+davidhicks980@users.noreply.github.com [cupertino.dart] Implement CupertinoMenuAnchor and CupertinoMenuItem using RawMenuAnchor (flutter/flutter#174695)
2026-02-06 116356835+AbdeMohlbi@users.noreply.github.com `flutter_tool` : Remove redundant enum types inside the enum definition scope (flutter/flutter#181910)
2026-02-06 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#181973)
2026-02-05 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from J2QdLcY2gyt4NP_xV... to IOzzhWfhdzhu3zHsz... (flutter/flutter#181971)
2026-02-05 sstrickl@google.com Directly generate a Mach-O dynamic library using gen_snapshot. [reland] (flutter/flutter#181539)
2026-02-05 matej.knopp@gmail.com macOS: Implement tooltip window controller (flutter/flutter#180895)
2026-02-05 victorsanniay@gmail.com Constrain RawAutocomplete options by soft keyboard (flutter/flutter#181930)
2026-02-05 engine-flutter-autoroll@skia.org Roll Skia from 079d092f49e6 to 39aa2a70213a (1 revision) (flutter/flutter#181970)
2026-02-05 285025525@qq.com perf: web ui loadFontFromList (flutter/flutter#181440)
2026-02-05 vs.ashoknarayan@gmail.com Improve accessibility contrast for pre-test message (flutter/flutter#180469)
2026-02-05 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#181965)
2026-02-05 engine-flutter-autoroll@skia.org Roll Skia from 8543ce512d5c to 079d092f49e6 (8 revisions) (flutter/flutter#181964)
2026-02-05 50643541+Mairramer@users.noreply.github.com Add `clearError` API to Form and FormFieldState (flutter/flutter#180752)
2026-02-05 okorohelijah@google.com Bump minimum required Xcode version to 15 and recommended to 16 (flutter/flutter#180531)
2026-02-05 GiancarloCante@gmail.com Rename "widgetTester" parameter to "tester" in "WidgetTesterCallback" (flutter/flutter#180944)
2026-02-05 engine-flutter-autoroll@skia.org Roll Packages from 3bddf2c to c197455 (3 revisions) (flutter/flutter#181962)
2026-02-05 jason-simmons@users.noreply.github.com Temporarily remove the Pixel 9/API 36 device from the Firebase Test Lab tests. (flutter/flutter#181956)

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 stuartmorgan@google.com 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

...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

engine flutter/engine related. See also e: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants