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

Commit 90e2eb3

Browse files
author
jonahwilliams
committed
Merge branch 'back_to_exp_canvas' of github.com:jonahwilliams/engine into back_to_exp_canvas
2 parents 3938253 + eb2bd85 commit 90e2eb3

File tree

164 files changed

+3221
-1379
lines changed

Some content is hidden

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

164 files changed

+3221
-1379
lines changed

.github/workflows/third_party_scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
with:
2626
persist-credentials: false
2727
- name: "setup python"
28-
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f
28+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
2929
with:
3030
python-version: '3.7.7' # install the python version needed
3131
- name: "extract deps, find commit hash, pass to osv-scanner"

DEPS

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ vars = {
1414
'flutter_git': 'https://flutter.googlesource.com',
1515
'skia_git': 'https://skia.googlesource.com',
1616
'llvm_git': 'https://llvm.googlesource.com',
17-
'skia_revision': '95ef9caae482173eb7b20d5e13f8d9773a93f435',
17+
'skia_revision': '655699edfc9745af2172ba79b5a99b169fa800fb',
1818

1919
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2020
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,7 +56,7 @@ vars = {
5656
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
5757
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5858
# updated revision list of existing dependencies.
59-
'dart_revision': '139867e57ba92789aa4d649842b503ff1bd041c5',
59+
'dart_revision': '1a6246225b75aae44a5cba2b98ee6d55ecfc89b6',
6060

6161
# WARNING: DO NOT EDIT MANUALLY
6262
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -254,7 +254,7 @@ vars = {
254254
# The version / instance id of the cipd:chromium/fuchsia/test-scripts which
255255
# will be used altogether with fuchsia-sdk to setup the build / test
256256
# environment.
257-
'fuchsia_test_scripts_version': 'p5MYp7o9Tt0sossYJLfXHqroiahs0aFH4JBVifY4mUgC',
257+
'fuchsia_test_scripts_version': 'k4lKsecg0pdIp-U7coOUoIcvR1Ggjl0g7lACHsqv0ssC',
258258

259259
# The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
260260
# used altogether with fuchsia-sdk to generate gn based build rules.
@@ -437,7 +437,7 @@ deps = {
437437
Var('dart_git') + '/mockito.git@eb4d1daa20c105c94ac29689c1975f0850fa18f2',
438438

439439
'src/flutter/third_party/dart/third_party/pkg/native':
440-
Var('dart_git') + '/native.git@87e8f924f06458ccba11dda7edc26d607c663d60',
440+
Var('dart_git') + '/native.git@5e9e4795d1faa39efeb92ae42fc0fa353778308f',
441441

442442
'src/flutter/third_party/dart/third_party/pkg/package_config':
443443
Var('dart_git') + '/package_config.git@76934c2ca25922ec72909bbff7dfbddaf0d02bd9',
@@ -972,7 +972,7 @@ deps = {
972972
'packages': [
973973
{
974974
'package': 'fuchsia/sdk/core/linux-amd64',
975-
'version': 'JKPo9G1NaAdstrimWKIuDQKjafZ-odu9kVcXal4vhGkC'
975+
'version': 'xNv47d1TZmK9XgTxuUdu-T8YXnUl5oEdjd2DoE1GzVsC'
976976
}
977977
],
978978
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

ci/licenses_golden/excluded_files

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@
127127
../../../flutter/impeller/.clang-format
128128
../../../flutter/impeller/.gitignore
129129
../../../flutter/impeller/README.md
130-
../../../flutter/impeller/aiks/aiks_blend_unittests.cc
131130
../../../flutter/impeller/aiks/aiks_gradient_unittests.cc
132131
../../../flutter/impeller/aiks/aiks_unittests.cc
133132
../../../flutter/impeller/aiks/aiks_unittests.h
@@ -1532,6 +1531,7 @@
15321531
../../../flutter/third_party/dart/runtime/vm/heap/freelist_test.cc
15331532
../../../flutter/third_party/dart/runtime/vm/heap/heap_test.cc
15341533
../../../flutter/third_party/dart/runtime/vm/heap/safepoint_test.cc
1534+
../../../flutter/third_party/dart/runtime/vm/heap/splay_test.cc
15351535
../../../flutter/third_party/dart/runtime/vm/heap/weak_table_test.cc
15361536
../../../flutter/third_party/dart/runtime/vm/instructions_arm64_test.cc
15371537
../../../flutter/third_party/dart/runtime/vm/instructions_arm_test.cc
@@ -3334,6 +3334,7 @@
33343334
../../../fuchsia/sdk/linux/fidl/fuchsia.driver.development/meta.json
33353335
../../../fuchsia/sdk/linux/fidl/fuchsia.driver.framework/meta.json
33363336
../../../fuchsia/sdk/linux/fidl/fuchsia.driver.legacy/meta.json
3337+
../../../fuchsia/sdk/linux/fidl/fuchsia.driver.metadata/meta.json
33373338
../../../fuchsia/sdk/linux/fidl/fuchsia.driver.registrar/meta.json
33383339
../../../fuchsia/sdk/linux/fidl/fuchsia.driver.test/meta.json
33393340
../../../fuchsia/sdk/linux/fidl/fuchsia.element/meta.json
@@ -3350,7 +3351,6 @@
33503351
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.clock/meta.json
33513352
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.clockimpl/meta.json
33523353
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.gpio/meta.json
3353-
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.gpioimpl/meta.json
33543354
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.i2c.businfo/meta.json
33553355
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.i2c/meta.json
33563356
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.i2cimpl/meta.json
@@ -3560,6 +3560,7 @@
35603560
../../../fuchsia/sdk/linux/pkg/driver_devfs_cpp/meta.json
35613561
../../../fuchsia/sdk/linux/pkg/driver_incoming_cpp/meta.json
35623562
../../../fuchsia/sdk/linux/pkg/driver_logging_cpp/meta.json
3563+
../../../fuchsia/sdk/linux/pkg/driver_metadata_cpp/meta.json
35633564
../../../fuchsia/sdk/linux/pkg/driver_node_cpp/meta.json
35643565
../../../fuchsia/sdk/linux/pkg/driver_outgoing_cpp/meta.json
35653566
../../../fuchsia/sdk/linux/pkg/driver_runtime/meta.json

ci/licenses_golden/licenses_dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 248715c28461ea4aeb73cd5bcb5bc36e
1+
Signature: 2b488f1b7fc93b69b4f89d69211da628
22

33
====================================================================================================
44
LIBRARY: dart
@@ -4785,7 +4785,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
47854785
This Source Code Form is "Incompatible With Secondary Licenses", as
47864786
defined by the Mozilla Public License, v. 2.0.
47874787

4788-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/139867e57ba92789aa4d649842b503ff1bd041c5
4788+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/1a6246225b75aae44a5cba2b98ee6d55ecfc89b6
47894789
/third_party/fallback_root_certificates/
47904790

47914791
====================================================================================================

ci/licenses_golden/licenses_flutter

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44789,6 +44789,8 @@ ORIGIN: ../../../flutter/shell/platform/linux/fl_accessible_node_test.cc + ../..
4478944789
ORIGIN: ../../../flutter/shell/platform/linux/fl_accessible_text_field.cc + ../../../flutter/LICENSE
4479044790
ORIGIN: ../../../flutter/shell/platform/linux/fl_accessible_text_field.h + ../../../flutter/LICENSE
4479144791
ORIGIN: ../../../flutter/shell/platform/linux/fl_accessible_text_field_test.cc + ../../../flutter/LICENSE
44792+
ORIGIN: ../../../flutter/shell/platform/linux/fl_application.cc + ../../../flutter/LICENSE
44793+
ORIGIN: ../../../flutter/shell/platform/linux/fl_application_test.cc + ../../../flutter/LICENSE
4479244794
ORIGIN: ../../../flutter/shell/platform/linux/fl_basic_message_channel.cc + ../../../flutter/LICENSE
4479344795
ORIGIN: ../../../flutter/shell/platform/linux/fl_basic_message_channel_test.cc + ../../../flutter/LICENSE
4479444796
ORIGIN: ../../../flutter/shell/platform/linux/fl_binary_codec.cc + ../../../flutter/LICENSE
@@ -44910,6 +44912,7 @@ ORIGIN: ../../../flutter/shell/platform/linux/fl_window_state_monitor_test.cc +
4491044912
ORIGIN: ../../../flutter/shell/platform/linux/key_mapping.g.cc + ../../../flutter/LICENSE
4491144913
ORIGIN: ../../../flutter/shell/platform/linux/key_mapping.h + ../../../flutter/LICENSE
4491244914
ORIGIN: ../../../flutter/shell/platform/linux/key_mapping_test.cc + ../../../flutter/LICENSE
44915+
ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_application.h + ../../../flutter/LICENSE
4491344916
ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_basic_message_channel.h + ../../../flutter/LICENSE
4491444917
ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_binary_codec.h + ../../../flutter/LICENSE
4491544918
ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h + ../../../flutter/LICENSE
@@ -47712,6 +47715,8 @@ FILE: ../../../flutter/shell/platform/linux/fl_accessible_node_test.cc
4771247715
FILE: ../../../flutter/shell/platform/linux/fl_accessible_text_field.cc
4771347716
FILE: ../../../flutter/shell/platform/linux/fl_accessible_text_field.h
4771447717
FILE: ../../../flutter/shell/platform/linux/fl_accessible_text_field_test.cc
47718+
FILE: ../../../flutter/shell/platform/linux/fl_application.cc
47719+
FILE: ../../../flutter/shell/platform/linux/fl_application_test.cc
4771547720
FILE: ../../../flutter/shell/platform/linux/fl_basic_message_channel.cc
4771647721
FILE: ../../../flutter/shell/platform/linux/fl_basic_message_channel_test.cc
4771747722
FILE: ../../../flutter/shell/platform/linux/fl_binary_codec.cc
@@ -47833,6 +47838,7 @@ FILE: ../../../flutter/shell/platform/linux/fl_window_state_monitor_test.cc
4783347838
FILE: ../../../flutter/shell/platform/linux/key_mapping.g.cc
4783447839
FILE: ../../../flutter/shell/platform/linux/key_mapping.h
4783547840
FILE: ../../../flutter/shell/platform/linux/key_mapping_test.cc
47841+
FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_application.h
4783647842
FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_basic_message_channel.h
4783747843
FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_binary_codec.h
4783847844
FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h

ci/licenses_golden/licenses_fuchsia

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 84848687bef2917e575f7591e3c4e331
1+
Signature: 4cd43a6cd8c8b4928edbe9dd37e95809
22

33
====================================================================================================
44
LIBRARY: fuchsia_sdk
@@ -15234,7 +15234,6 @@ ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/
1523415234
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
1523515235
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/vendor_specific.fidl + ../../../fuchsia/sdk/linux/LICENSE
1523615236
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
15237-
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.gpioimpl/metadata.fidl + ../../../fuchsia/sdk/linux/LICENSE
1523815237
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.i2c.businfo/businfo.fidl + ../../../fuchsia/sdk/linux/LICENSE
1523915238
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/diagnostics.fidl + ../../../fuchsia/sdk/linux/LICENSE
1524015239
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
@@ -15593,7 +15592,6 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/ga
1559315592
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/overview.fidl
1559415593
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/vendor_specific.fidl
1559515594
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/overview.fidl
15596-
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.gpioimpl/metadata.fidl
1559715595
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.i2c.businfo/businfo.fidl
1559815596
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/diagnostics.fidl
1559915597
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/overview.fidl
@@ -15932,7 +15930,6 @@ LIBRARY: fuchsia_sdk
1593215930
ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.adc/fuchsia.adc.bind + ../../../fuchsia/sdk/linux/LICENSE
1593315931
ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.block/fuchsia.block.bind + ../../../fuchsia/sdk/linux/LICENSE
1593415932
ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.devicetree/fuchsia.devicetree.bind + ../../../fuchsia/sdk/linux/LICENSE
15935-
ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/flatland_example.dart + ../../../fuchsia/sdk/linux/LICENSE
1593615933
ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/media_session.dart + ../../../fuchsia/sdk/linux/LICENSE
1593715934
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.buttons/metadata.fidl + ../../../fuchsia/sdk/linux/LICENSE
1593815935
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.sandbox/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
@@ -15956,7 +15953,6 @@ ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/ring_buffer_forma
1595615953
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.bluetooth/vendor.fidl + ../../../fuchsia/sdk/linux/LICENSE
1595715954
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.clockimpl/clock-impl.fidl + ../../../fuchsia/sdk/linux/LICENSE
1595815955
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.clockimpl/init.fidl + ../../../fuchsia/sdk/linux/LICENSE
15959-
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.gpioimpl/gpio-impl.fidl + ../../../fuchsia/sdk/linux/LICENSE
1596015956
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.i2cimpl/i2cimpl.fidl + ../../../fuchsia/sdk/linux/LICENSE
1596115957
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power/config.fidl + ../../../fuchsia/sdk/linux/LICENSE
1596215958
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.sdmmc/metadata.fidl + ../../../fuchsia/sdk/linux/LICENSE
@@ -16038,7 +16034,6 @@ TYPE: LicenseType.bsd
1603816034
FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.adc/fuchsia.adc.bind
1603916035
FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.block/fuchsia.block.bind
1604016036
FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.devicetree/fuchsia.devicetree.bind
16041-
FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/flatland_example.dart
1604216037
FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/media_session.dart
1604316038
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.buttons/metadata.fidl
1604416039
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.sandbox/overview.fidl
@@ -16062,7 +16057,6 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/ring_buffer_format.
1606216057
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.bluetooth/vendor.fidl
1606316058
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.clockimpl/clock-impl.fidl
1606416059
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.clockimpl/init.fidl
16065-
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.gpioimpl/gpio-impl.fidl
1606616060
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.i2cimpl/i2cimpl.fidl
1606716061
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power/config.fidl
1606816062
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.sdmmc/metadata.fidl
@@ -16182,6 +16176,7 @@ ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/coding_format.fidl + .
1618216176
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.sandbox/availability.fidl + ../../../fuchsia/sdk/linux/LICENSE
1618316177
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/introspector.fidl + ../../../fuchsia/sdk/linux/LICENSE
1618416178
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.device.fs/controller.fidl + ../../../fuchsia/sdk/linux/LICENSE
16179+
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.metadata/fuchsia.driver.metadata.fidl + ../../../fuchsia/sdk/linux/LICENSE
1618516180
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.test/internal.fidl + ../../../fuchsia/sdk/linux/LICENSE
1618616181
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.bluetooth/emulator.fidl + ../../../fuchsia/sdk/linux/LICENSE
1618716182
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.bluetooth/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
@@ -16225,6 +16220,8 @@ ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-21/sysroot/include/zircon/availab
1622516220
ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-22/sysroot/include/zircon/availability_levels.inc + ../../../fuchsia/sdk/linux/LICENSE
1622616221
ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-23/sysroot/include/zircon/availability_levels.inc + ../../../fuchsia/sdk/linux/LICENSE
1622716222
ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-NEXT/sysroot/include/zircon/availability_levels.inc + ../../../fuchsia/sdk/linux/LICENSE
16223+
ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_metadata_cpp/include/lib/driver/metadata/cpp/metadata.h + ../../../fuchsia/sdk/linux/LICENSE
16224+
ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_metadata_cpp/include/lib/driver/metadata/cpp/metadata_server.h + ../../../fuchsia/sdk/linux/LICENSE
1622816225
ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_node_cpp/add_child.cc + ../../../fuchsia/sdk/linux/LICENSE
1622916226
ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_node_cpp/include/lib/driver/node/cpp/add_child.h + ../../../fuchsia/sdk/linux/LICENSE
1623016227
ORIGIN: ../../../fuchsia/sdk/linux/pkg/vulkan/offer.shard.cml + ../../../fuchsia/sdk/linux/LICENSE
@@ -16242,6 +16239,7 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/coding_format.fidl
1624216239
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.sandbox/availability.fidl
1624316240
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/introspector.fidl
1624416241
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.device.fs/controller.fidl
16242+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.metadata/fuchsia.driver.metadata.fidl
1624516243
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.test/internal.fidl
1624616244
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.bluetooth/emulator.fidl
1624716245
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.bluetooth/overview.fidl
@@ -16285,6 +16283,8 @@ FILE: ../../../fuchsia/sdk/linux/obj/x64-api-21/sysroot/include/zircon/availabil
1628516283
FILE: ../../../fuchsia/sdk/linux/obj/x64-api-22/sysroot/include/zircon/availability_levels.inc
1628616284
FILE: ../../../fuchsia/sdk/linux/obj/x64-api-23/sysroot/include/zircon/availability_levels.inc
1628716285
FILE: ../../../fuchsia/sdk/linux/obj/x64-api-NEXT/sysroot/include/zircon/availability_levels.inc
16286+
FILE: ../../../fuchsia/sdk/linux/pkg/driver_metadata_cpp/include/lib/driver/metadata/cpp/metadata.h
16287+
FILE: ../../../fuchsia/sdk/linux/pkg/driver_metadata_cpp/include/lib/driver/metadata/cpp/metadata_server.h
1628816288
FILE: ../../../fuchsia/sdk/linux/pkg/driver_node_cpp/add_child.cc
1628916289
FILE: ../../../fuchsia/sdk/linux/pkg/driver_node_cpp/include/lib/driver/node/cpp/add_child.h
1629016290
FILE: ../../../fuchsia/sdk/linux/pkg/vulkan/offer.shard.cml

ci/licenses_golden/licenses_skia

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: e5b90c6c71c1e2bd46550c98fa2f05b0
1+
Signature: 460cd81c397855690a585125a19843f4
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -397,6 +397,7 @@ FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/pathops.bench.js
397397
FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/perfReporter.js
398398
FILE: ../../../flutter/third_party/skia/modules/skparagraph/test.html
399399
FILE: ../../../flutter/third_party/skia/package-lock.json
400+
FILE: ../../../flutter/third_party/skia/relnotes/android-codec-gainmap.md
400401
FILE: ../../../flutter/third_party/skia/relnotes/filter-color.md
401402
FILE: ../../../flutter/third_party/skia/relnotes/ganesh-move.md
402403
FILE: ../../../flutter/third_party/skia/relnotes/grglconfig.md

common/graphics/persistent_cache.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "flutter/shell/version/version.h"
2525
#include "openssl/sha.h"
2626
#include "rapidjson/document.h"
27-
#include "third_party/skia/include/gpu/GrDirectContext.h"
27+
#include "third_party/skia/include/gpu/ganesh/GrDirectContext.h"
2828

2929
namespace flutter {
3030

common/graphics/persistent_cache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "flutter/fml/macros.h"
1616
#include "flutter/fml/task_runner.h"
1717
#include "flutter/fml/unique_fd.h"
18-
#include "third_party/skia/include/gpu/GrContextOptions.h"
18+
#include "third_party/skia/include/gpu/ganesh/GrContextOptions.h"
1919

2020
class GrDirectContext;
2121

display_list/benchmarking/dl_benchmarks.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
#include "third_party/skia/include/core/SkPoint.h"
1414
#include "third_party/skia/include/core/SkSurface.h"
1515
#include "third_party/skia/include/core/SkTextBlob.h"
16-
#include "third_party/skia/include/gpu/GrDirectContext.h"
17-
#include "third_party/skia/include/gpu/GrRecordingContext.h"
18-
#include "third_party/skia/include/gpu/GrTypes.h"
16+
#include "third_party/skia/include/gpu/ganesh/GrDirectContext.h"
17+
#include "third_party/skia/include/gpu/ganesh/GrRecordingContext.h"
18+
#include "third_party/skia/include/gpu/ganesh/GrTypes.h"
1919

2020
namespace flutter {
2121
namespace testing {

0 commit comments

Comments
 (0)