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

Commit 144ec4a

Browse files
matanlureymatanlurey
committed
Merge remote-tracking branch 'upstream/main' into engine-mono-worskpace-pubspec
2 parents 50fa853 + d4ef035 commit 144ec4a

Some content is hidden

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

55 files changed

+375
-213
lines changed

‎DEPS‎

Lines changed: 3 additions & 3 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': '5f21260470cf4ac328c8f0b2e5b4f93e482f9207',
17+
'skia_revision': '354b30fe7ab54c325bf07e92126b57dcd608a131',
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': 'b5fc85cfcf1bae20d72fc6d8c5d490ff98eead51',
59+
'dart_revision': '38bb74f63829eb08a2bd191226c40064aa457ee0',
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
@@ -979,7 +979,7 @@ deps = {
979979
'packages': [
980980
{
981981
'package': 'fuchsia/sdk/core/linux-amd64',
982-
'version': 'WUN7NQK04NjF9fRmfM16ILdIhytQAHB7O1631G4HsIEC'
982+
'version': 'n2dgSmMCaCO7ujvmrHIPlsgMLgz3zcicHJUi7-7_zgkC'
983983
}
984984
],
985985
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

‎ci/licenses_golden/licenses_dart‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 0e4af40f333ea146834d901da41a1124
1+
Signature: 5f25db7a3b96987251f429d03beef50e
22

33
====================================================================================================
44
LIBRARY: dart
@@ -3914,7 +3914,6 @@ ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm_js_compatibilit
39143914
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/int_patch.dart + ../../../flutter/third_party/dart/LICENSE
39153915
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/string_buffer_patch.dart + ../../../flutter/third_party/dart/LICENSE
39163916
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/string_patch.dart + ../../../flutter/third_party/dart/LICENSE
3917-
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/typed_data.dart + ../../../flutter/third_party/dart/LICENSE
39183917
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/typed_data_patch.dart + ../../../flutter/third_party/dart/LICENSE
39193918
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/async/future_extensions.dart + ../../../flutter/third_party/dart/LICENSE
39203919
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/js_interop/js_interop.dart + ../../../flutter/third_party/dart/LICENSE
@@ -3978,7 +3977,6 @@ FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm_js_compatibility/
39783977
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/int_patch.dart
39793978
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/string_buffer_patch.dart
39803979
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/string_patch.dart
3981-
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/typed_data.dart
39823980
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/typed_data_patch.dart
39833981
FILE: ../../../flutter/third_party/dart/sdk/lib/async/future_extensions.dart
39843982
FILE: ../../../flutter/third_party/dart/sdk/lib/js_interop/js_interop.dart
@@ -4753,7 +4751,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
47534751
This Source Code Form is "Incompatible With Secondary Licenses", as
47544752
defined by the Mozilla Public License, v. 2.0.
47554753

4756-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/bb18127b2a8e1a1afd882efcc38271212b238ff3
4754+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/38bb74f63829eb08a2bd191226c40064aa457ee0
47574755
/third_party/fallback_root_certificates/
47584756

47594757
====================================================================================================

‎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: a5329b90f250b2818eb738443619fbc2
1+
Signature: a4b111728b0d148c1fac1b95d99eb2ff
22

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

‎ci/licenses_golden/licenses_skia‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: e8a3423781271215a5e149d0e6e6257c
1+
Signature: a02b75f777c977c06fe7fa3ba9368969
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -9516,6 +9516,7 @@ ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/Precom
95169516
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileBase.h + ../../../flutter/third_party/skia/LICENSE
95179517
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileBlender.h + ../../../flutter/third_party/skia/LICENSE
95189518
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileColorFilter.h + ../../../flutter/third_party/skia/LICENSE
9519+
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileMaskFilter.h + ../../../flutter/third_party/skia/LICENSE
95199520
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileShader.h + ../../../flutter/third_party/skia/LICENSE
95209521
ORIGIN: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_coretext.h + ../../../flutter/third_party/skia/LICENSE
95219522
ORIGIN: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_factory.h + ../../../flutter/third_party/skia/LICENSE
@@ -9563,6 +9564,7 @@ ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/Precompile
95639564
ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PrecompileBlenderPriv.h + ../../../flutter/third_party/skia/LICENSE
95649565
ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PrecompileColorFilter.cpp + ../../../flutter/third_party/skia/LICENSE
95659566
ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PrecompileColorFiltersPriv.h + ../../../flutter/third_party/skia/LICENSE
9567+
ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PrecompileMaskFilter.cpp + ../../../flutter/third_party/skia/LICENSE
95669568
ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PrecompileShader.cpp + ../../../flutter/third_party/skia/LICENSE
95679569
ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PrecompileShaderPriv.h + ../../../flutter/third_party/skia/LICENSE
95689570
ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PrecompileShadersPriv.h + ../../../flutter/third_party/skia/LICENSE
@@ -9603,6 +9605,7 @@ FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/Precompi
96039605
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileBase.h
96049606
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileBlender.h
96059607
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileColorFilter.h
9608+
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileMaskFilter.h
96069609
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileShader.h
96079610
FILE: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_coretext.h
96089611
FILE: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_factory.h
@@ -9650,6 +9653,7 @@ FILE: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PrecompileBl
96509653
FILE: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PrecompileBlenderPriv.h
96519654
FILE: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PrecompileColorFilter.cpp
96529655
FILE: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PrecompileColorFiltersPriv.h
9656+
FILE: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PrecompileMaskFilter.cpp
96539657
FILE: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PrecompileShader.cpp
96549658
FILE: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PrecompileShaderPriv.h
96559659
FILE: ../../../flutter/third_party/skia/src/gpu/graphite/precompile/PrecompileShadersPriv.h

‎display_list/benchmarking/dl_benchmarks.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,7 @@ void BM_DrawVertices(benchmark::State& state,
806806
std::shared_ptr<DlVertices> vertices =
807807
GetTestVertices(p, radius, 50, mode, vertex_count);
808808
total_vertex_count += vertex_count;
809-
builder.DrawVertices(vertices.get(), DlBlendMode::kSrc, paint);
809+
builder.DrawVertices(vertices, DlBlendMode::kSrc, paint);
810810
}
811811

812812
state.counters["VertexCount"] = total_vertex_count;

‎display_list/benchmarking/dl_complexity_gl.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ void DisplayListGLComplexityCalculator::GLHelper::drawPoints(
494494
}
495495

496496
void DisplayListGLComplexityCalculator::GLHelper::drawVertices(
497-
const DlVertices* vertices,
497+
const std::shared_ptr<DlVertices>& vertices,
498498
DlBlendMode mode) {
499499
// There is currently no way for us to get the VertexMode from the SkVertices
500500
// object, but for future reference:

‎display_list/benchmarking/dl_complexity_gl.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ class DisplayListGLComplexityCalculator
5757
void drawPoints(DlCanvas::PointMode mode,
5858
uint32_t count,
5959
const SkPoint points[]) override;
60-
void drawVertices(const DlVertices* vertices, DlBlendMode mode) override;
60+
void drawVertices(const std::shared_ptr<DlVertices>& vertices,
61+
DlBlendMode mode) override;
6162
void drawImage(const sk_sp<DlImage> image,
6263
const SkPoint point,
6364
DlImageSampling sampling,

‎display_list/benchmarking/dl_complexity_metal.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ void DisplayListMetalComplexityCalculator::MetalHelper::drawPoints(
446446
}
447447

448448
void DisplayListMetalComplexityCalculator::MetalHelper::drawVertices(
449-
const DlVertices* vertices,
449+
const std::shared_ptr<DlVertices>& vertices,
450450
DlBlendMode mode) {
451451
// There is currently no way for us to get the VertexMode from the SkVertices
452452
// object, but for future reference:

‎display_list/benchmarking/dl_complexity_metal.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ class DisplayListMetalComplexityCalculator
5757
void drawPoints(DlCanvas::PointMode mode,
5858
uint32_t count,
5959
const SkPoint points[]) override;
60-
void drawVertices(const DlVertices* vertices, DlBlendMode mode) override;
60+
void drawVertices(const std::shared_ptr<DlVertices>& vertices,
61+
DlBlendMode mode) override;
6162
void drawImage(const sk_sp<DlImage> image,
6263
const SkPoint point,
6364
DlImageSampling sampling,

‎display_list/benchmarking/dl_complexity_unittests.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ TEST(DisplayListComplexity, DrawVertices) {
295295
auto vertices = DlVertices::Make(DlVertexMode::kTriangles, points.size(),
296296
points.data(), nullptr, nullptr);
297297
DisplayListBuilder builder;
298-
builder.DrawVertices(vertices.get(), DlBlendMode::kSrc, DlPaint());
298+
builder.DrawVertices(vertices, DlBlendMode::kSrc, DlPaint());
299299
auto display_list = builder.Build();
300300

301301
auto calculators = AccumulatorCalculators();

0 commit comments

Comments
 (0)