Merge branch 'main' into web_test_reorganization

flutter · Mar 24, 2023 · 6d5fa74 · 6d5fa74
2 parents d4a7f5a + aa1227a
commit 6d5fa74
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/DEPS b/DEPS
@@ -18,7 +18,7 @@ vars = {
   'llvm_git': 'https://llvm.googlesource.com',
   # OCMock is for testing only so there is no google clone
   'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
-  'skia_revision': '32ffab0c9432d5b3d23c654dcc53a4e95a4a47e7',
+  'skia_revision': '86228d7534de1c4f3daf2c0b24fe8c772beed720',
 
   # 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/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia
@@ -1,4 +1,4 @@
-Signature: 9590e5a83c41e8513e527bb0c14ff889
+Signature: 210989a7c4f537f36336e6ad3bdb8692
 
 ====================================================================================================
 LIBRARY: etc1
@@ -7714,8 +7714,8 @@ ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLSwizzle.cpp + ../../../third_p
 ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLTernaryExpression.cpp + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLTypeReference.cpp + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLVarDeclarations.cpp + ../../../third_party/skia/LICENSE
-ORIGIN: ../../../third_party/skia/src/sksl/tracing/SkVMDebugTrace.cpp + ../../../third_party/skia/LICENSE
-ORIGIN: ../../../third_party/skia/src/sksl/tracing/SkVMDebugTrace.h + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../third_party/skia/src/sksl/tracing/SkSLDebugTracePriv.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../third_party/skia/src/sksl/tracing/SkSLDebugTracePriv.h + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/sksl/tracing/SkVMDebugTracePlayer.cpp + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/sksl/tracing/SkVMDebugTracePlayer.h + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/sksl/transform/SkSLEliminateDeadFunctions.cpp + ../../../third_party/skia/LICENSE
@@ -7939,8 +7939,8 @@ FILE: ../../../third_party/skia/src/sksl/ir/SkSLSwizzle.cpp
 FILE: ../../../third_party/skia/src/sksl/ir/SkSLTernaryExpression.cpp
 FILE: ../../../third_party/skia/src/sksl/ir/SkSLTypeReference.cpp
 FILE: ../../../third_party/skia/src/sksl/ir/SkSLVarDeclarations.cpp
-FILE: ../../../third_party/skia/src/sksl/tracing/SkVMDebugTrace.cpp
-FILE: ../../../third_party/skia/src/sksl/tracing/SkVMDebugTrace.h
+FILE: ../../../third_party/skia/src/sksl/tracing/SkSLDebugTracePriv.cpp
+FILE: ../../../third_party/skia/src/sksl/tracing/SkSLDebugTracePriv.h
 FILE: ../../../third_party/skia/src/sksl/tracing/SkVMDebugTracePlayer.cpp
 FILE: ../../../third_party/skia/src/sksl/tracing/SkVMDebugTracePlayer.h
 FILE: ../../../third_party/skia/src/sksl/transform/SkSLEliminateDeadFunctions.cpp
@@ -8492,9 +8492,6 @@ ORIGIN: ../../../third_party/skia/src/sksl/analysis/SkSLProgramUsage.h + ../../.
 ORIGIN: ../../../third_party/skia/src/sksl/codegen/SkSLRasterPipelineCodeGenerator.cpp + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/sksl/codegen/SkSLRasterPipelineCodeGenerator.h + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLProgram.cpp + ../../../third_party/skia/LICENSE
-ORIGIN: ../../../third_party/skia/src/sksl/tracing/SkRPDebugTrace.cpp + ../../../third_party/skia/LICENSE
-ORIGIN: ../../../third_party/skia/src/sksl/tracing/SkRPDebugTrace.h + ../../../third_party/skia/LICENSE
-ORIGIN: ../../../third_party/skia/src/sksl/tracing/SkSLDebugInfo.h + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/sksl/transform/SkSLAddConstToVarModifiers.cpp + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/sksl/transform/SkSLEliminateEmptyStatements.cpp + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinFunctions.cpp + ../../../third_party/skia/LICENSE
@@ -8717,9 +8714,6 @@ FILE: ../../../third_party/skia/src/sksl/analysis/SkSLProgramUsage.h
 FILE: ../../../third_party/skia/src/sksl/codegen/SkSLRasterPipelineCodeGenerator.cpp
 FILE: ../../../third_party/skia/src/sksl/codegen/SkSLRasterPipelineCodeGenerator.h
 FILE: ../../../third_party/skia/src/sksl/ir/SkSLProgram.cpp
-FILE: ../../../third_party/skia/src/sksl/tracing/SkRPDebugTrace.cpp
-FILE: ../../../third_party/skia/src/sksl/tracing/SkRPDebugTrace.h
-FILE: ../../../third_party/skia/src/sksl/tracing/SkSLDebugInfo.h
 FILE: ../../../third_party/skia/src/sksl/transform/SkSLAddConstToVarModifiers.cpp
 FILE: ../../../third_party/skia/src/sksl/transform/SkSLEliminateEmptyStatements.cpp
 FILE: ../../../third_party/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinFunctions.cpp