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

Commit f1c9d6d

Browse files
gspencergooggspencergoog
authored
Merge branch 'main' into add_macos_objcdoc
2 parents a2499fc + c254deb commit f1c9d6d

File tree

126 files changed

+3766
-685
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+3766
-685
lines changed

‎BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ group("unittests") {
187187
if (is_mac) {
188188
public_deps += [
189189
"//flutter/impeller/golden_tests:impeller_golden_tests",
190-
"//flutter/shell/platform/darwin:flutter_channels_unittests",
190+
"//flutter/shell/platform/darwin/common:framework_common_unittests",
191191
"//flutter/third_party/spring_animation:spring_animation_unittests",
192192
]
193193
}

‎DEPS

Lines changed: 6 additions & 6 deletions
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': 'bd3ee535e24687c1268e336a58be5a98748056c3',
21+
'skia_revision': '45c0a830d805169fc3076115ef3a0cae274a4cc9',
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.
@@ -39,7 +39,7 @@ vars = {
3939
# The list of revisions for these tools comes from Fuchsia, here:
4040
# https://fuchsia.googlesource.com/integration/+/HEAD/toolchain
4141
# If there are problems with the toolchain, contact fuchsia-toolchain@.
42-
'clang_version': 'git_revision:07c59204878045b58ea1fe976ac2aac58d2efbb6',
42+
'clang_version': 'git_revision:020d2fb7711d70e296f19d83565f8d93d2cfda71',
4343

4444
# The goma version and the clang version can be tightly coupled. If goma
4545
# stops working on a clang roll, this may need to be updated using the value
@@ -53,7 +53,7 @@ vars = {
5353
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
5454
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5555
# updated revision list of existing dependencies.
56-
'dart_revision': 'dcd09f5726b770df00ae0a596eff0817238be232',
56+
'dart_revision': 'a0b59bac20fc5505c9115a279220818620b56dc5',
5757

5858
# WARNING: DO NOT EDIT MANUALLY
5959
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -257,7 +257,7 @@ allowed_hosts = [
257257
]
258258

259259
deps = {
260-
'src': 'https://github.com/flutter/buildroot.git' + '@' + '6e71c38443c0bf9d8954c87bf69bb4e019f44f94',
260+
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'a067408d923ccf80742571bb7a71705499f5779e',
261261

262262
# Fuchsia compatibility
263263
#
@@ -884,7 +884,7 @@ deps = {
884884
'packages': [
885885
{
886886
'package': 'fuchsia/sdk/core/mac-amd64',
887-
'version': 'Qo3dJIXjK-Ia8j42JByo585ZGQ85ddt1EdqV71Vd6bMC'
887+
'version': 'jMLeVECzwzDoe9dYSKqrkHFMapXsDwwcFRAOp3FGf3sC'
888888
}
889889
],
890890
'condition': 'host_os == "mac" and not download_fuchsia_sdk',
@@ -894,7 +894,7 @@ deps = {
894894
'packages': [
895895
{
896896
'package': 'fuchsia/sdk/core/linux-amd64',
897-
'version': 'KPSWBhOvG6piddBQGjbnutOw4JoLbHNwd9UmvtJ2IxwC'
897+
'version': 'ZvUiUZL9vUp2LcvHGHnjFis6tKvXuAzUQe5Ax_6XLCsC'
898898
}
899899
],
900900
'condition': 'host_os == "linux" and not download_fuchsia_sdk',

‎ci/licenses_golden/excluded_files

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
../../../flutter/display_list/benchmarking/dl_complexity_unittests.cc
3333
../../../flutter/display_list/display_list_unittests.cc
3434
../../../flutter/display_list/dl_color_unittests.cc
35+
../../../flutter/display_list/dl_op_spy_unittests.cc
3536
../../../flutter/display_list/dl_paint_unittests.cc
3637
../../../flutter/display_list/dl_vertices_unittests.cc
3738
../../../flutter/display_list/effects/dl_color_filter_unittests.cc
@@ -215,7 +216,6 @@
215216
../../../flutter/runtime/type_conversions_unittests.cc
216217
../../../flutter/shell/common/animator_unittests.cc
217218
../../../flutter/shell/common/context_options_unittests.cc
218-
../../../flutter/shell/common/dl_op_spy_unittests.cc
219219
../../../flutter/shell/common/engine_unittests.cc
220220
../../../flutter/shell/common/fixtures
221221
../../../flutter/shell/common/input_events_unittests.cc
@@ -2837,7 +2837,6 @@
28372837
../../../third_party/skia/src/sksl/README.md
28382838
../../../third_party/skia/src/sksl/analysis/BUILD.bazel
28392839
../../../third_party/skia/src/sksl/codegen/BUILD.bazel
2840-
../../../third_party/skia/src/sksl/dsl/BUILD.bazel
28412840
../../../third_party/skia/src/sksl/ir/BUILD.bazel
28422841
../../../third_party/skia/src/sksl/lex/BUILD.bazel
28432842
../../../third_party/skia/src/sksl/tracing/BUILD.bazel

‎ci/licenses_golden/licenses_dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 5ff4ab55c15b9432cfdfa481f0a33789
1+
Signature: efa0643cb3bda4786f858946feab2837
22

33
====================================================================================================
44
LIBRARY: dart

‎ci/licenses_golden/licenses_flutter

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -731,6 +731,8 @@ ORIGIN: ../../../flutter/display_list/dl_op_receiver.cc + ../../../flutter/LICEN
731731
ORIGIN: ../../../flutter/display_list/dl_op_receiver.h + ../../../flutter/LICENSE
732732
ORIGIN: ../../../flutter/display_list/dl_op_records.cc + ../../../flutter/LICENSE
733733
ORIGIN: ../../../flutter/display_list/dl_op_records.h + ../../../flutter/LICENSE
734+
ORIGIN: ../../../flutter/display_list/dl_op_spy.cc + ../../../flutter/LICENSE
735+
ORIGIN: ../../../flutter/display_list/dl_op_spy.h + ../../../flutter/LICENSE
734736
ORIGIN: ../../../flutter/display_list/dl_paint.cc + ../../../flutter/LICENSE
735737
ORIGIN: ../../../flutter/display_list/dl_paint.h + ../../../flutter/LICENSE
736738
ORIGIN: ../../../flutter/display_list/dl_sampling_options.h + ../../../flutter/LICENSE
@@ -787,6 +789,8 @@ ORIGIN: ../../../flutter/flow/instrumentation.cc + ../../../flutter/LICENSE
787789
ORIGIN: ../../../flutter/flow/instrumentation.h + ../../../flutter/LICENSE
788790
ORIGIN: ../../../flutter/flow/layer_snapshot_store.cc + ../../../flutter/LICENSE
789791
ORIGIN: ../../../flutter/flow/layer_snapshot_store.h + ../../../flutter/LICENSE
792+
ORIGIN: ../../../flutter/flow/layers/aiks_layer.cc + ../../../flutter/LICENSE
793+
ORIGIN: ../../../flutter/flow/layers/aiks_layer.h + ../../../flutter/LICENSE
790794
ORIGIN: ../../../flutter/flow/layers/backdrop_filter_layer.cc + ../../../flutter/LICENSE
791795
ORIGIN: ../../../flutter/flow/layers/backdrop_filter_layer.h + ../../../flutter/LICENSE
792796
ORIGIN: ../../../flutter/flow/layers/cacheable_layer.cc + ../../../flutter/LICENSE
@@ -1153,6 +1157,8 @@ ORIGIN: ../../../flutter/impeller/core/texture_descriptor.cc + ../../../flutter/
11531157
ORIGIN: ../../../flutter/impeller/core/texture_descriptor.h + ../../../flutter/LICENSE
11541158
ORIGIN: ../../../flutter/impeller/core/vertex_buffer.cc + ../../../flutter/LICENSE
11551159
ORIGIN: ../../../flutter/impeller/core/vertex_buffer.h + ../../../flutter/LICENSE
1160+
ORIGIN: ../../../flutter/impeller/display_list/dl_aiks_canvas.cc + ../../../flutter/LICENSE
1161+
ORIGIN: ../../../flutter/impeller/display_list/dl_aiks_canvas.h + ../../../flutter/LICENSE
11561162
ORIGIN: ../../../flutter/impeller/display_list/dl_dispatcher.cc + ../../../flutter/LICENSE
11571163
ORIGIN: ../../../flutter/impeller/display_list/dl_dispatcher.h + ../../../flutter/LICENSE
11581164
ORIGIN: ../../../flutter/impeller/display_list/dl_image_impeller.cc + ../../../flutter/LICENSE
@@ -2210,8 +2216,6 @@ ORIGIN: ../../../flutter/shell/common/display.cc + ../../../flutter/LICENSE
22102216
ORIGIN: ../../../flutter/shell/common/display.h + ../../../flutter/LICENSE
22112217
ORIGIN: ../../../flutter/shell/common/display_manager.cc + ../../../flutter/LICENSE
22122218
ORIGIN: ../../../flutter/shell/common/display_manager.h + ../../../flutter/LICENSE
2213-
ORIGIN: ../../../flutter/shell/common/dl_op_spy.cc + ../../../flutter/LICENSE
2214-
ORIGIN: ../../../flutter/shell/common/dl_op_spy.h + ../../../flutter/LICENSE
22152219
ORIGIN: ../../../flutter/shell/common/engine.cc + ../../../flutter/LICENSE
22162220
ORIGIN: ../../../flutter/shell/common/engine.h + ../../../flutter/LICENSE
22172221
ORIGIN: ../../../flutter/shell/common/pipeline.cc + ../../../flutter/LICENSE
@@ -3441,6 +3445,8 @@ FILE: ../../../flutter/display_list/dl_op_receiver.cc
34413445
FILE: ../../../flutter/display_list/dl_op_receiver.h
34423446
FILE: ../../../flutter/display_list/dl_op_records.cc
34433447
FILE: ../../../flutter/display_list/dl_op_records.h
3448+
FILE: ../../../flutter/display_list/dl_op_spy.cc
3449+
FILE: ../../../flutter/display_list/dl_op_spy.h
34443450
FILE: ../../../flutter/display_list/dl_paint.cc
34453451
FILE: ../../../flutter/display_list/dl_paint.h
34463452
FILE: ../../../flutter/display_list/dl_sampling_options.h
@@ -3497,6 +3503,8 @@ FILE: ../../../flutter/flow/instrumentation.cc
34973503
FILE: ../../../flutter/flow/instrumentation.h
34983504
FILE: ../../../flutter/flow/layer_snapshot_store.cc
34993505
FILE: ../../../flutter/flow/layer_snapshot_store.h
3506+
FILE: ../../../flutter/flow/layers/aiks_layer.cc
3507+
FILE: ../../../flutter/flow/layers/aiks_layer.h
35003508
FILE: ../../../flutter/flow/layers/backdrop_filter_layer.cc
35013509
FILE: ../../../flutter/flow/layers/backdrop_filter_layer.h
35023510
FILE: ../../../flutter/flow/layers/cacheable_layer.cc
@@ -3863,6 +3871,8 @@ FILE: ../../../flutter/impeller/core/texture_descriptor.cc
38633871
FILE: ../../../flutter/impeller/core/texture_descriptor.h
38643872
FILE: ../../../flutter/impeller/core/vertex_buffer.cc
38653873
FILE: ../../../flutter/impeller/core/vertex_buffer.h
3874+
FILE: ../../../flutter/impeller/display_list/dl_aiks_canvas.cc
3875+
FILE: ../../../flutter/impeller/display_list/dl_aiks_canvas.h
38663876
FILE: ../../../flutter/impeller/display_list/dl_dispatcher.cc
38673877
FILE: ../../../flutter/impeller/display_list/dl_dispatcher.h
38683878
FILE: ../../../flutter/impeller/display_list/dl_image_impeller.cc
@@ -4925,8 +4935,6 @@ FILE: ../../../flutter/shell/common/display.cc
49254935
FILE: ../../../flutter/shell/common/display.h
49264936
FILE: ../../../flutter/shell/common/display_manager.cc
49274937
FILE: ../../../flutter/shell/common/display_manager.h
4928-
FILE: ../../../flutter/shell/common/dl_op_spy.cc
4929-
FILE: ../../../flutter/shell/common/dl_op_spy.h
49304938
FILE: ../../../flutter/shell/common/engine.cc
49314939
FILE: ../../../flutter/shell/common/engine.h
49324940
FILE: ../../../flutter/shell/common/pipeline.cc

‎ci/licenses_golden/licenses_fuchsia

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 0acd332ef3d0441bd3cf3435b6c48441
1+
Signature: 16b2c54be96578037934a7f89c22ad3a
22

33
====================================================================================================
44
LIBRARY: fuchsia_sdk

‎ci/licenses_golden/licenses_skia

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: e49fa1ed220cc564b13990cad09a0d5d
1+
Signature: 9d52a4499043c347932bbb6ffcdc3d6e
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -388,6 +388,7 @@ FILE: ../../../third_party/skia/relnotes/asyncyuva420.md
388388
FILE: ../../../third_party/skia/relnotes/canvas_flush.md
389389
FILE: ../../../third_party/skia/relnotes/const_context.md
390390
FILE: ../../../third_party/skia/relnotes/mesh_ganesh.md
391+
FILE: ../../../third_party/skia/relnotes/path_715M.md
391392
FILE: ../../../third_party/skia/relnotes/runtimeeffect_const.md
392393
FILE: ../../../third_party/skia/relnotes/runtimeeffect_image.md
393394
FILE: ../../../third_party/skia/relnotes/skgl_backend_surface.md
@@ -5766,6 +5767,7 @@ ORIGIN: ../../../third_party/skia/gm/skbug_8664.cpp + ../../../third_party/skia/
57665767
ORIGIN: ../../../third_party/skia/gm/skbug_8955.cpp + ../../../third_party/skia/LICENSE
57675768
ORIGIN: ../../../third_party/skia/gm/video_decoder.cpp + ../../../third_party/skia/LICENSE
57685769
ORIGIN: ../../../third_party/skia/gm/yuv420_odd_dim.cpp + ../../../third_party/skia/LICENSE
5770+
ORIGIN: ../../../third_party/skia/include/android/GrAHardwareBufferUtils.h + ../../../third_party/skia/LICENSE
57695771
ORIGIN: ../../../third_party/skia/include/core/SkTileMode.h + ../../../third_party/skia/LICENSE
57705772
ORIGIN: ../../../third_party/skia/include/gpu/GrContextThreadSafeProxy.h + ../../../third_party/skia/LICENSE
57715773
ORIGIN: ../../../third_party/skia/include/gpu/GrRecordingContext.h + ../../../third_party/skia/LICENSE
@@ -5828,9 +5830,7 @@ ORIGIN: ../../../third_party/skia/src/core/SkPathMakers.h + ../../../third_party
58285830
ORIGIN: ../../../third_party/skia/src/core/SkStrikeSpec.h + ../../../third_party/skia/LICENSE
58295831
ORIGIN: ../../../third_party/skia/src/core/SkYUVMath.cpp + ../../../third_party/skia/LICENSE
58305832
ORIGIN: ../../../third_party/skia/src/core/SkYUVMath.h + ../../../third_party/skia/LICENSE
5831-
ORIGIN: ../../../third_party/skia/src/gpu/GrAHardwareBufferUtils.h + ../../../third_party/skia/LICENSE
58325833
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrAHardwareBufferUtils.cpp + ../../../third_party/skia/LICENSE
5833-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrAHardwareBufferUtils_impl.h + ../../../third_party/skia/LICENSE
58345834
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrBaseContextPriv.h + ../../../third_party/skia/LICENSE
58355835
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrBuffer.h + ../../../third_party/skia/LICENSE
58365836
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrContextThreadSafeProxy.cpp + ../../../third_party/skia/LICENSE
@@ -5910,6 +5910,7 @@ FILE: ../../../third_party/skia/gm/skbug_8664.cpp
59105910
FILE: ../../../third_party/skia/gm/skbug_8955.cpp
59115911
FILE: ../../../third_party/skia/gm/video_decoder.cpp
59125912
FILE: ../../../third_party/skia/gm/yuv420_odd_dim.cpp
5913+
FILE: ../../../third_party/skia/include/android/GrAHardwareBufferUtils.h
59135914
FILE: ../../../third_party/skia/include/core/SkTileMode.h
59145915
FILE: ../../../third_party/skia/include/gpu/GrContextThreadSafeProxy.h
59155916
FILE: ../../../third_party/skia/include/gpu/GrRecordingContext.h
@@ -5972,9 +5973,7 @@ FILE: ../../../third_party/skia/src/core/SkPathMakers.h
59725973
FILE: ../../../third_party/skia/src/core/SkStrikeSpec.h
59735974
FILE: ../../../third_party/skia/src/core/SkYUVMath.cpp
59745975
FILE: ../../../third_party/skia/src/core/SkYUVMath.h
5975-
FILE: ../../../third_party/skia/src/gpu/GrAHardwareBufferUtils.h
59765976
FILE: ../../../third_party/skia/src/gpu/ganesh/GrAHardwareBufferUtils.cpp
5977-
FILE: ../../../third_party/skia/src/gpu/ganesh/GrAHardwareBufferUtils_impl.h
59785977
FILE: ../../../third_party/skia/src/gpu/ganesh/GrBaseContextPriv.h
59795978
FILE: ../../../third_party/skia/src/gpu/ganesh/GrBuffer.h
59805979
FILE: ../../../third_party/skia/src/gpu/ganesh/GrContextThreadSafeProxy.cpp
@@ -7917,8 +7916,6 @@ ORIGIN: ../../../third_party/skia/src/sksl/SkSLParser.cpp + ../../../third_party
79177916
ORIGIN: ../../../third_party/skia/src/sksl/SkSLParser.h + ../../../third_party/skia/LICENSE
79187917
ORIGIN: ../../../third_party/skia/src/sksl/SkSLPosition.h + ../../../third_party/skia/LICENSE
79197918
ORIGIN: ../../../third_party/skia/src/sksl/SkSLProgramKind.h + ../../../third_party/skia/LICENSE
7920-
ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLStatement.cpp + ../../../third_party/skia/LICENSE
7921-
ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLStatement.h + ../../../third_party/skia/LICENSE
79227919
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.cpp + ../../../third_party/skia/LICENSE
79237920
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLModifierFlags.cpp + ../../../third_party/skia/LICENSE
79247921
ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLPoison.h + ../../../third_party/skia/LICENSE
@@ -7952,8 +7949,6 @@ FILE: ../../../third_party/skia/src/sksl/SkSLParser.cpp
79527949
FILE: ../../../third_party/skia/src/sksl/SkSLParser.h
79537950
FILE: ../../../third_party/skia/src/sksl/SkSLPosition.h
79547951
FILE: ../../../third_party/skia/src/sksl/SkSLProgramKind.h
7955-
FILE: ../../../third_party/skia/src/sksl/dsl/DSLStatement.cpp
7956-
FILE: ../../../third_party/skia/src/sksl/dsl/DSLStatement.h
79577952
FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.cpp
79587953
FILE: ../../../third_party/skia/src/sksl/ir/SkSLModifierFlags.cpp
79597954
FILE: ../../../third_party/skia/src/sksl/ir/SkSLPoison.h
@@ -8979,6 +8974,7 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/effects/GrColorTableEffect.cpp
89798974
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/effects/GrColorTableEffect.h + ../../../third_party/skia/LICENSE
89808975
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/effects/GrPerlinNoise2Effect.cpp + ../../../third_party/skia/LICENSE
89818976
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/effects/GrPerlinNoise2Effect.h + ../../../third_party/skia/LICENSE
8977+
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/gl/AHardwareBufferGL.cpp + ../../../third_party/skia/LICENSE
89828978
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLBackendSurface.cpp + ../../../third_party/skia/LICENSE
89838979
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLBackendSurfacePriv.h + ../../../third_party/skia/LICENSE
89848980
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.cpp + ../../../third_party/skia/LICENSE
@@ -8991,6 +8987,7 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_RasterPinnable.cp
89918987
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_RasterPinnable.h + ../../../third_party/skia/LICENSE
89928988
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/SkSpecialImage_Ganesh.cpp + ../../../third_party/skia/LICENSE
89938989
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/surface/SkSurface_AndroidFactories.cpp + ../../../third_party/skia/LICENSE
8990+
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/vk/AHardwareBufferVk.cpp + ../../../third_party/skia/LICENSE
89948991
ORIGIN: ../../../third_party/skia/src/gpu/graphite/AtlasProvider.cpp + ../../../third_party/skia/LICENSE
89958992
ORIGIN: ../../../third_party/skia/src/gpu/graphite/AtlasProvider.h + ../../../third_party/skia/LICENSE
89968993
ORIGIN: ../../../third_party/skia/src/gpu/graphite/BackendSemaphore.cpp + ../../../third_party/skia/LICENSE
@@ -9193,6 +9190,7 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrColorTableEffect.cpp
91939190
FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrColorTableEffect.h
91949191
FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrPerlinNoise2Effect.cpp
91959192
FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrPerlinNoise2Effect.h
9193+
FILE: ../../../third_party/skia/src/gpu/ganesh/gl/AHardwareBufferGL.cpp
91969194
FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLBackendSurface.cpp
91979195
FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLBackendSurfacePriv.h
91989196
FILE: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.cpp
@@ -9205,6 +9203,7 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_RasterPinnable.cpp
92059203
FILE: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_RasterPinnable.h
92069204
FILE: ../../../third_party/skia/src/gpu/ganesh/image/SkSpecialImage_Ganesh.cpp
92079205
FILE: ../../../third_party/skia/src/gpu/ganesh/surface/SkSurface_AndroidFactories.cpp
9206+
FILE: ../../../third_party/skia/src/gpu/ganesh/vk/AHardwareBufferVk.cpp
92089207
FILE: ../../../third_party/skia/src/gpu/graphite/AtlasProvider.cpp
92099208
FILE: ../../../third_party/skia/src/gpu/graphite/AtlasProvider.h
92109209
FILE: ../../../third_party/skia/src/gpu/graphite/BackendSemaphore.cpp

‎display_list/BUILD.gn

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ source_set("display_list") {
3939
"dl_op_receiver.h",
4040
"dl_op_records.cc",
4141
"dl_op_records.h",
42+
"dl_op_spy.cc",
43+
"dl_op_spy.h",
4244
"dl_paint.cc",
4345
"dl_paint.h",
4446
"dl_sampling_options.h",
@@ -107,6 +109,7 @@ if (enable_unittests) {
107109
"benchmarking/dl_complexity_unittests.cc",
108110
"display_list_unittests.cc",
109111
"dl_color_unittests.cc",
112+
"dl_op_spy_unittests.cc",
110113
"dl_paint_unittests.cc",
111114
"dl_vertices_unittests.cc",
112115
"effects/dl_color_filter_unittests.cc",

‎display_list/display_list.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ DisplayList::DisplayList(DisplayListStorage&& storage,
3434
bool can_apply_group_opacity,
3535
bool is_ui_thread_safe,
3636
bool modifies_transparent_black,
37-
sk_sp<const DlRTree> rtree)
37+
std::shared_ptr<const DlRTree> rtree)
3838
: storage_(std::move(storage)),
3939
byte_count_(byte_count),
4040
op_count_(op_count),

‎display_list/display_list.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ class DisplayList : public SkRefCnt {
254254
const SkRect& bounds() const { return bounds_; }
255255

256256
bool has_rtree() const { return rtree_ != nullptr; }
257-
sk_sp<const DlRTree> rtree() const { return rtree_; }
257+
std::shared_ptr<const DlRTree> rtree() const { return rtree_; }
258258

259259
bool Equals(const DisplayList* other) const;
260260
bool Equals(const DisplayList& other) const { return Equals(&other); }
@@ -288,7 +288,7 @@ class DisplayList : public SkRefCnt {
288288
bool can_apply_group_opacity,
289289
bool is_ui_thread_safe,
290290
bool modifies_transparent_black,
291-
sk_sp<const DlRTree> rtree);
291+
std::shared_ptr<const DlRTree> rtree);
292292

293293
static uint32_t next_unique_id();
294294

@@ -308,7 +308,7 @@ class DisplayList : public SkRefCnt {
308308
const bool is_ui_thread_safe_;
309309
const bool modifies_transparent_black_;
310310

311-
const sk_sp<const DlRTree> rtree_;
311+
const std::shared_ptr<const DlRTree> rtree_;
312312

313313
void Dispatch(DlOpReceiver& ctx,
314314
uint8_t* ptr,

‎display_list/display_list_unittests.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2130,7 +2130,7 @@ TEST_F(DisplayListTest, FlatDrawPointsProducesBounds) {
21302130
}
21312131
}
21322132

2133-
static void test_rtree(const sk_sp<const DlRTree>& rtree,
2133+
static void test_rtree(const std::shared_ptr<const DlRTree>& rtree,
21342134
const SkRect& query,
21352135
std::vector<SkRect> expected_rects,
21362136
const std::vector<int>& expected_indices) {

0 commit comments

Comments
 (0)