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

Commit cb61324

Browse files
authored
Merge branch 'main' into vulkan-orientation-polling
2 parents 7493322 + 3603028 commit cb61324

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ vars = {
1818
'llvm_git': 'https://llvm.googlesource.com',
1919
# OCMock is for testing only so there is no google clone
2020
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
21-
'skia_revision': '68b80f663be6bdb87e24d732d1cef5619b02fdd2',
21+
'skia_revision': '1fbe521b2c56cca97a69b659c09d9954dd1baaf8',
2222

2323
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2424
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.

ci/licenses_golden/excluded_files

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2617,6 +2617,7 @@
26172617
../../../third_party/skia/fuzz/README.md
26182618
../../../third_party/skia/gm/BUILD.bazel
26192619
../../../third_party/skia/gm/android_gm_test.bzl
2620+
../../../third_party/skia/gm/png_codec.bzl
26202621
../../../third_party/skia/gm/surface_manager/BUILD.bazel
26212622
../../../third_party/skia/gm/vias/BUILD.bazel
26222623
../../../third_party/skia/gn/BUILD.bazel

ci/licenses_golden/licenses_skia

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 81a2fe3a3b65f75195d276341feda77d
1+
Signature: fcc6e811d8f1b52932c10b20a951b643
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -8868,6 +8868,7 @@ ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzQuadRoots.cpp + ../../../thi
88688868
ORIGIN: ../../../third_party/skia/gm/BazelGMRunner.cpp + ../../../third_party/skia/LICENSE
88698869
ORIGIN: ../../../third_party/skia/gm/BazelNoopRunner.cpp + ../../../third_party/skia/LICENSE
88708870
ORIGIN: ../../../third_party/skia/gm/graphite_replay.cpp + ../../../third_party/skia/LICENSE
8871+
ORIGIN: ../../../third_party/skia/gm/png_codec.cpp + ../../../third_party/skia/LICENSE
88718872
ORIGIN: ../../../third_party/skia/gm/rippleshadergm.cpp + ../../../third_party/skia/LICENSE
88728873
ORIGIN: ../../../third_party/skia/gm/scaledrects.cpp + ../../../third_party/skia/LICENSE
88738874
ORIGIN: ../../../third_party/skia/gm/surface_manager/GaneshGLSurfaceManager.cpp + ../../../third_party/skia/LICENSE
@@ -9094,6 +9095,7 @@ FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzQuadRoots.cpp
90949095
FILE: ../../../third_party/skia/gm/BazelGMRunner.cpp
90959096
FILE: ../../../third_party/skia/gm/BazelNoopRunner.cpp
90969097
FILE: ../../../third_party/skia/gm/graphite_replay.cpp
9098+
FILE: ../../../third_party/skia/gm/png_codec.cpp
90979099
FILE: ../../../third_party/skia/gm/rippleshadergm.cpp
90989100
FILE: ../../../third_party/skia/gm/scaledrects.cpp
90999101
FILE: ../../../third_party/skia/gm/surface_manager/GaneshGLSurfaceManager.cpp

0 commit comments

Comments
 (0)