From 3e015d2dab750fa19e9dbfa858927c7d02f38d2a Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Fri, 6 Feb 2026 13:04:10 -0800 Subject: [PATCH] Manual roll Skia from 39aa2a70213a to 9a983f6c2c06 (#181986) Includes updates for the renaming of SkDebug to SkLog --- DEPS | 2 +- engine/src/flutter/skia/BUILD.gn | 12 ++++++------ engine/src/flutter/sky/packages/sky_engine/LICENSE | 7 +++++++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/DEPS b/DEPS index 94f37832b58..fc96308454e 100644 --- a/DEPS +++ b/DEPS @@ -15,7 +15,7 @@ vars = { 'flutter_git': 'https://flutter.googlesource.com', 'skia_git': 'https://skia.googlesource.com', 'llvm_git': 'https://llvm.googlesource.com', - 'skia_revision': '39aa2a70213a831964d763dfd1dcd6a5f3410da1', + 'skia_revision': '9a983f6c2c06a8396cc1dd2d579df5919fd6ea99', # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version. diff --git a/engine/src/flutter/skia/BUILD.gn b/engine/src/flutter/skia/BUILD.gn index e222a9df6b4..1ef44cbe016 100644 --- a/engine/src/flutter/skia/BUILD.gn +++ b/engine/src/flutter/skia/BUILD.gn @@ -708,8 +708,8 @@ skia_component("skia") { if (is_win) { sources += skia_ports_windows_sources sources += [ - "$_skia_root/src/ports/SkDebug_win.cpp", "$_skia_root/src/ports/SkImageGeneratorWIC.cpp", + "$_skia_root/src/ports/SkLog_win.cpp", ] libs += [ "Ole32.lib", @@ -732,7 +732,7 @@ skia_component("skia") { if (is_android) { deps += [ "//flutter/third_party/expat" ] - sources += [ "$_skia_root/src/ports/SkDebug_android.cpp" ] + sources += [ "$_skia_root/src/ports/SkLog_android.cpp" ] libs += [ "EGL", "GLESv2", @@ -741,7 +741,7 @@ skia_component("skia") { } if (is_linux || is_wasm || is_qnx) { - sources += [ "$_skia_root/src/ports/SkDebug_stdio.cpp" ] + sources += [ "$_skia_root/src/ports/SkLog_stdio.cpp" ] if (skia_use_egl) { libs += [ "GLESv2" ] } @@ -750,8 +750,8 @@ skia_component("skia") { if (is_mac) { public += [ "$_skia_root/include/ports/SkCFObject.h" ] sources += [ - "$_skia_root/src/ports/SkDebug_stdio.cpp", "$_skia_root/src/ports/SkImageGeneratorCG.cpp", + "$_skia_root/src/ports/SkLog_stdio.cpp", ] frameworks = [ "ApplicationServices.framework", @@ -762,8 +762,8 @@ skia_component("skia") { if (is_ios) { public += [ "$_skia_root/include/ports/SkCFObject.h" ] sources += [ - "$_skia_root/src/ports/SkDebug_stdio.cpp", "$_skia_root/src/ports/SkImageGeneratorCG.cpp", + "$_skia_root/src/ports/SkLog_stdio.cpp", ] frameworks = [ "CoreFoundation.framework", @@ -773,6 +773,6 @@ skia_component("skia") { } if (is_fuchsia) { - sources += [ "$_skia_root/src/ports/SkDebug_stdio.cpp" ] + sources += [ "$_skia_root/src/ports/SkLog_stdio.cpp" ] } } diff --git a/engine/src/flutter/sky/packages/sky_engine/LICENSE b/engine/src/flutter/sky/packages/sky_engine/LICENSE index a489af5a7e4..f4741768b2f 100644 --- a/engine/src/flutter/sky/packages/sky_engine/LICENSE +++ b/engine/src/flutter/sky/packages/sky_engine/LICENSE @@ -17184,6 +17184,13 @@ skia Copyright 2026 Google LLC +Use of this source code is governed by a BSD-style license that can be +found in the LICENSE file. +-------------------------------------------------------------------------------- +skia + +Copyright 2026 The Android Open Source Project + Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. --------------------------------------------------------------------------------