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

Commit b4bc1e4

Browse files
matanlureymatanlurey
committed
Merge remote-tracking branch 'upstream/main' into engine-clang-tidy-for-githooks
2 parents 2becd72 + a64ccad commit b4bc1e4

File tree

146 files changed

+4852
-4115
lines changed

Some content is hidden

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

146 files changed

+4852
-4115
lines changed

‎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': '40442138ec94df1334ab9a6070ebaa67a3aad223',
21+
'skia_revision': 'bf6019be75efeee2a6a2aa862bfebc297b449786',
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.
@@ -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': '00f6f69187dfe3f0a93c3f9e10517aecee210b60',
56+
'dart_revision': '3ebf0fedfcebbaffb4397c88f041bc95a1a3912b',
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
@@ -63,7 +63,7 @@ vars = {
6363
'dart_browser_launcher_rev': '27ec600af41b0d0ebe9a3db6ad36e9ed11976b84',
6464
'dart_clock_rev': '263e508a36ed90e4d85b60dd70552d20e71a9ae9',
6565
'dart_collection_rev': '1a9b7eb64be10a8ba4ced7eb36b4b265a49d5d41',
66-
'dart_devtools_rev': '6f42c1d59d95dcacde130f2910c1d10be8508e61',
66+
'dart_devtools_rev': '79b5094a0ba523633f69276aa566e53d98c3a067',
6767
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
6868
'dart_perfetto_rev': 'b8da07095979310818f0efde2ef3c69ea70d62c5',
6969
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
@@ -332,7 +332,7 @@ deps = {
332332
Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@cdb7aeab40b4c522de20b242019f7e88641445d5',
333333

334334
'src/third_party/dart/third_party/devtools':
335-
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:6f42c1d59d95dcacde130f2910c1d10be8508e61'}]},
335+
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:79b5094a0ba523633f69276aa566e53d98c3a067'}]},
336336

337337
'src/third_party/dart/third_party/pkg/args':
338338
Var('dart_git') + '/args.git@da56b18ebcb600e050bf57b9c1103b1d2a9fb2ff',
@@ -884,7 +884,7 @@ deps = {
884884
'packages': [
885885
{
886886
'package': 'fuchsia/sdk/core/mac-amd64',
887-
'version': 'DA_PryqcVU6Um3j2knmxFnoY0owmURpknkVTtrPBXXQC'
887+
'version': 'G25oJMO5jbUi-UN4FM1owc2acv-i0u7MdKqblmI-czMC'
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': 'RVhmZNTYsaIiTyjwPz_v93og9qBqvH0fo75kFNmXe10C'
897+
'version': 'kKI09su99b0AKs8b3VKTzXDVmeTaKm7ye2chxl9BE0EC'
898898
}
899899
],
900900
'condition': 'host_os == "linux" and not download_fuchsia_sdk',

‎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: be4e90db216cb0cf3c3e2366fe923317
1+
Signature: 1e850cb6cd4de368cc26a62d37a6a14e
22

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

‎ci/licenses_golden/licenses_flutter‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -717,22 +717,18 @@ ORIGIN: ../../../flutter/display_list/benchmarking/dl_complexity_metal.h + ../..
717717
ORIGIN: ../../../flutter/display_list/benchmarking/dl_region_benchmarks.cc + ../../../flutter/LICENSE
718718
ORIGIN: ../../../flutter/display_list/display_list.cc + ../../../flutter/LICENSE
719719
ORIGIN: ../../../flutter/display_list/display_list.h + ../../../flutter/LICENSE
720-
ORIGIN: ../../../flutter/display_list/display_list_builder.cc + ../../../flutter/LICENSE
721-
ORIGIN: ../../../flutter/display_list/display_list_builder.h + ../../../flutter/LICENSE
722720
ORIGIN: ../../../flutter/display_list/dl_attributes.h + ../../../flutter/LICENSE
723721
ORIGIN: ../../../flutter/display_list/dl_blend_mode.cc + ../../../flutter/LICENSE
724722
ORIGIN: ../../../flutter/display_list/dl_blend_mode.h + ../../../flutter/LICENSE
723+
ORIGIN: ../../../flutter/display_list/dl_builder.cc + ../../../flutter/LICENSE
724+
ORIGIN: ../../../flutter/display_list/dl_builder.h + ../../../flutter/LICENSE
725725
ORIGIN: ../../../flutter/display_list/dl_canvas.cc + ../../../flutter/LICENSE
726726
ORIGIN: ../../../flutter/display_list/dl_canvas.h + ../../../flutter/LICENSE
727-
ORIGIN: ../../../flutter/display_list/dl_canvas_to_receiver.cc + ../../../flutter/LICENSE
728-
ORIGIN: ../../../flutter/display_list/dl_canvas_to_receiver.h + ../../../flutter/LICENSE
729727
ORIGIN: ../../../flutter/display_list/dl_color.h + ../../../flutter/LICENSE
730728
ORIGIN: ../../../flutter/display_list/dl_op_flags.cc + ../../../flutter/LICENSE
731729
ORIGIN: ../../../flutter/display_list/dl_op_flags.h + ../../../flutter/LICENSE
732730
ORIGIN: ../../../flutter/display_list/dl_op_receiver.cc + ../../../flutter/LICENSE
733731
ORIGIN: ../../../flutter/display_list/dl_op_receiver.h + ../../../flutter/LICENSE
734-
ORIGIN: ../../../flutter/display_list/dl_op_recorder.cc + ../../../flutter/LICENSE
735-
ORIGIN: ../../../flutter/display_list/dl_op_recorder.h + ../../../flutter/LICENSE
736732
ORIGIN: ../../../flutter/display_list/dl_op_records.cc + ../../../flutter/LICENSE
737733
ORIGIN: ../../../flutter/display_list/dl_op_records.h + ../../../flutter/LICENSE
738734
ORIGIN: ../../../flutter/display_list/dl_paint.cc + ../../../flutter/LICENSE
@@ -1873,12 +1869,10 @@ ORIGIN: ../../../flutter/lib/ui/text/asset_manager_font_provider.cc + ../../../f
18731869
ORIGIN: ../../../flutter/lib/ui/text/asset_manager_font_provider.h + ../../../flutter/LICENSE
18741870
ORIGIN: ../../../flutter/lib/ui/text/font_collection.cc + ../../../flutter/LICENSE
18751871
ORIGIN: ../../../flutter/lib/ui/text/font_collection.h + ../../../flutter/LICENSE
1876-
ORIGIN: ../../../flutter/lib/ui/text/line_metrics.h + ../../../flutter/LICENSE
18771872
ORIGIN: ../../../flutter/lib/ui/text/paragraph.cc + ../../../flutter/LICENSE
18781873
ORIGIN: ../../../flutter/lib/ui/text/paragraph.h + ../../../flutter/LICENSE
18791874
ORIGIN: ../../../flutter/lib/ui/text/paragraph_builder.cc + ../../../flutter/LICENSE
18801875
ORIGIN: ../../../flutter/lib/ui/text/paragraph_builder.h + ../../../flutter/LICENSE
1881-
ORIGIN: ../../../flutter/lib/ui/text/text_box.h + ../../../flutter/LICENSE
18821876
ORIGIN: ../../../flutter/lib/ui/ui.dart + ../../../flutter/LICENSE
18831877
ORIGIN: ../../../flutter/lib/ui/ui_benchmarks.cc + ../../../flutter/LICENSE
18841878
ORIGIN: ../../../flutter/lib/ui/ui_dart_state.cc + ../../../flutter/LICENSE
@@ -2146,6 +2140,7 @@ ORIGIN: ../../../flutter/lib/web_ui/lib/ui.dart + ../../../flutter/LICENSE
21462140
ORIGIN: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web.dart + ../../../flutter/LICENSE
21472141
ORIGIN: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/asset_manager.dart + ../../../flutter/LICENSE
21482142
ORIGIN: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/benchmarks.dart + ../../../flutter/LICENSE
2143+
ORIGIN: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/images.dart + ../../../flutter/LICENSE
21492144
ORIGIN: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/initialization.dart + ../../../flutter/LICENSE
21502145
ORIGIN: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/navigation/platform_location.dart + ../../../flutter/LICENSE
21512146
ORIGIN: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/navigation/url_strategy.dart + ../../../flutter/LICENSE
@@ -3444,22 +3439,18 @@ FILE: ../../../flutter/display_list/benchmarking/dl_complexity_metal.h
34443439
FILE: ../../../flutter/display_list/benchmarking/dl_region_benchmarks.cc
34453440
FILE: ../../../flutter/display_list/display_list.cc
34463441
FILE: ../../../flutter/display_list/display_list.h
3447-
FILE: ../../../flutter/display_list/display_list_builder.cc
3448-
FILE: ../../../flutter/display_list/display_list_builder.h
34493442
FILE: ../../../flutter/display_list/dl_attributes.h
34503443
FILE: ../../../flutter/display_list/dl_blend_mode.cc
34513444
FILE: ../../../flutter/display_list/dl_blend_mode.h
3445+
FILE: ../../../flutter/display_list/dl_builder.cc
3446+
FILE: ../../../flutter/display_list/dl_builder.h
34523447
FILE: ../../../flutter/display_list/dl_canvas.cc
34533448
FILE: ../../../flutter/display_list/dl_canvas.h
3454-
FILE: ../../../flutter/display_list/dl_canvas_to_receiver.cc
3455-
FILE: ../../../flutter/display_list/dl_canvas_to_receiver.h
34563449
FILE: ../../../flutter/display_list/dl_color.h
34573450
FILE: ../../../flutter/display_list/dl_op_flags.cc
34583451
FILE: ../../../flutter/display_list/dl_op_flags.h
34593452
FILE: ../../../flutter/display_list/dl_op_receiver.cc
34603453
FILE: ../../../flutter/display_list/dl_op_receiver.h
3461-
FILE: ../../../flutter/display_list/dl_op_recorder.cc
3462-
FILE: ../../../flutter/display_list/dl_op_recorder.h
34633454
FILE: ../../../flutter/display_list/dl_op_records.cc
34643455
FILE: ../../../flutter/display_list/dl_op_records.h
34653456
FILE: ../../../flutter/display_list/dl_paint.cc
@@ -4605,12 +4596,10 @@ FILE: ../../../flutter/lib/ui/text/asset_manager_font_provider.cc
46054596
FILE: ../../../flutter/lib/ui/text/asset_manager_font_provider.h
46064597
FILE: ../../../flutter/lib/ui/text/font_collection.cc
46074598
FILE: ../../../flutter/lib/ui/text/font_collection.h
4608-
FILE: ../../../flutter/lib/ui/text/line_metrics.h
46094599
FILE: ../../../flutter/lib/ui/text/paragraph.cc
46104600
FILE: ../../../flutter/lib/ui/text/paragraph.h
46114601
FILE: ../../../flutter/lib/ui/text/paragraph_builder.cc
46124602
FILE: ../../../flutter/lib/ui/text/paragraph_builder.h
4613-
FILE: ../../../flutter/lib/ui/text/text_box.h
46144603
FILE: ../../../flutter/lib/ui/ui.dart
46154604
FILE: ../../../flutter/lib/ui/ui_benchmarks.cc
46164605
FILE: ../../../flutter/lib/ui/ui_dart_state.cc
@@ -4878,6 +4867,7 @@ FILE: ../../../flutter/lib/web_ui/lib/ui.dart
48784867
FILE: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web.dart
48794868
FILE: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/asset_manager.dart
48804869
FILE: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/benchmarks.dart
4870+
FILE: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/images.dart
48814871
FILE: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/initialization.dart
48824872
FILE: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/navigation/platform_location.dart
48834873
FILE: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/navigation/url_strategy.dart

‎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: 062292fe63e1bbf97f5b3720800ba338
1+
Signature: f5a79e03f71c637e3403cd42714e48b0
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: 9370fb648fbb83b4dc91810dcd8eafdf
1+
Signature: 5dad8cab4c7769274c06df254b1bf3cf
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -8900,8 +8900,10 @@ ORIGIN: ../../../third_party/skia/include/private/chromium/SkImageChromium.h + .
89008900
ORIGIN: ../../../third_party/skia/include/private/gpu/ganesh/GrTextureGenerator.h + ../../../third_party/skia/LICENSE
89018901
ORIGIN: ../../../third_party/skia/modules/bentleyottmann/include/EventQueue.h + ../../../third_party/skia/LICENSE
89028902
ORIGIN: ../../../third_party/skia/modules/bentleyottmann/include/Point.h + ../../../third_party/skia/LICENSE
8903+
ORIGIN: ../../../third_party/skia/modules/bentleyottmann/include/Segment.h + ../../../third_party/skia/LICENSE
89038904
ORIGIN: ../../../third_party/skia/modules/bentleyottmann/src/EventQueue.cpp + ../../../third_party/skia/LICENSE
89048905
ORIGIN: ../../../third_party/skia/modules/bentleyottmann/src/Point.cpp + ../../../third_party/skia/LICENSE
8906+
ORIGIN: ../../../third_party/skia/modules/bentleyottmann/src/Segment.cpp + ../../../third_party/skia/LICENSE
89058907
ORIGIN: ../../../third_party/skia/src/base/SkBezierCurves.h + ../../../third_party/skia/LICENSE
89068908
ORIGIN: ../../../third_party/skia/src/base/SkCubics.cpp + ../../../third_party/skia/LICENSE
89078909
ORIGIN: ../../../third_party/skia/src/base/SkCubics.h + ../../../third_party/skia/LICENSE
@@ -9138,8 +9140,10 @@ FILE: ../../../third_party/skia/include/private/chromium/SkImageChromium.h
91389140
FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrTextureGenerator.h
91399141
FILE: ../../../third_party/skia/modules/bentleyottmann/include/EventQueue.h
91409142
FILE: ../../../third_party/skia/modules/bentleyottmann/include/Point.h
9143+
FILE: ../../../third_party/skia/modules/bentleyottmann/include/Segment.h
91419144
FILE: ../../../third_party/skia/modules/bentleyottmann/src/EventQueue.cpp
91429145
FILE: ../../../third_party/skia/modules/bentleyottmann/src/Point.cpp
9146+
FILE: ../../../third_party/skia/modules/bentleyottmann/src/Segment.cpp
91439147
FILE: ../../../third_party/skia/src/base/SkBezierCurves.h
91449148
FILE: ../../../third_party/skia/src/base/SkCubics.cpp
91459149
FILE: ../../../third_party/skia/src/base/SkCubics.h

‎display_list/BUILD.gn‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,18 @@ source_set("display_list") {
2525
"benchmarking/dl_complexity_metal.h",
2626
"display_list.cc",
2727
"display_list.h",
28-
"display_list_builder.cc",
29-
"display_list_builder.h",
3028
"dl_attributes.h",
3129
"dl_blend_mode.cc",
3230
"dl_blend_mode.h",
31+
"dl_builder.cc",
32+
"dl_builder.h",
3333
"dl_canvas.cc",
3434
"dl_canvas.h",
35-
"dl_canvas_to_receiver.cc",
36-
"dl_canvas_to_receiver.h",
3735
"dl_color.h",
3836
"dl_op_flags.cc",
3937
"dl_op_flags.h",
4038
"dl_op_receiver.cc",
4139
"dl_op_receiver.h",
42-
"dl_op_recorder.cc",
43-
"dl_op_recorder.h",
4440
"dl_op_records.cc",
4541
"dl_op_records.h",
4642
"dl_paint.cc",

‎display_list/benchmarking/dl_benchmarks.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// found in the LICENSE file.
44

55
#include "flutter/display_list/benchmarking/dl_benchmarks.h"
6-
#include "flutter/display_list/display_list_builder.h"
6+
#include "flutter/display_list/dl_builder.h"
77
#include "flutter/display_list/dl_op_flags.h"
88
#include "flutter/display_list/skia/dl_sk_canvas.h"
99

‎display_list/benchmarking/dl_complexity_gl.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ void DisplayListGLComplexityCalculator::GLHelper::drawVertices(
503503
}
504504

505505
void DisplayListGLComplexityCalculator::GLHelper::drawImage(
506-
const sk_sp<DlImage>& image,
506+
const sk_sp<DlImage> image,
507507
const SkPoint point,
508508
DlImageSampling sampling,
509509
bool render_with_attributes) {
@@ -583,7 +583,7 @@ void DisplayListGLComplexityCalculator::GLHelper::ImageRect(
583583
}
584584

585585
void DisplayListGLComplexityCalculator::GLHelper::drawImageNine(
586-
const sk_sp<DlImage>& image,
586+
const sk_sp<DlImage> image,
587587
const SkIRect& center,
588588
const SkRect& dst,
589589
DlFilterMode filter,
@@ -608,7 +608,7 @@ void DisplayListGLComplexityCalculator::GLHelper::drawImageNine(
608608
}
609609

610610
void DisplayListGLComplexityCalculator::GLHelper::drawDisplayList(
611-
const sk_sp<DisplayList>& display_list,
611+
const sk_sp<DisplayList> display_list,
612612
SkScalar opacity) {
613613
if (IsComplex()) {
614614
return;
@@ -622,7 +622,7 @@ void DisplayListGLComplexityCalculator::GLHelper::drawDisplayList(
622622
}
623623

624624
void DisplayListGLComplexityCalculator::GLHelper::drawTextBlob(
625-
const sk_sp<SkTextBlob>& blob,
625+
const sk_sp<SkTextBlob> blob,
626626
SkScalar x,
627627
SkScalar y) {
628628
if (IsComplex()) {

‎display_list/benchmarking/dl_complexity_gl.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,18 @@ class DisplayListGLComplexityCalculator
5656
uint32_t count,
5757
const SkPoint points[]) override;
5858
void drawVertices(const DlVertices* vertices, DlBlendMode mode) override;
59-
void drawImage(const sk_sp<DlImage>& image,
59+
void drawImage(const sk_sp<DlImage> image,
6060
const SkPoint point,
6161
DlImageSampling sampling,
6262
bool render_with_attributes) override;
63-
void drawImageNine(const sk_sp<DlImage>& image,
63+
void drawImageNine(const sk_sp<DlImage> image,
6464
const SkIRect& center,
6565
const SkRect& dst,
6666
DlFilterMode filter,
6767
bool render_with_attributes) override;
68-
void drawDisplayList(const sk_sp<DisplayList>& display_list,
68+
void drawDisplayList(const sk_sp<DisplayList> display_list,
6969
SkScalar opacity) override;
70-
void drawTextBlob(const sk_sp<SkTextBlob>& blob,
70+
void drawTextBlob(const sk_sp<SkTextBlob> blob,
7171
SkScalar x,
7272
SkScalar y) override;
7373
void drawShadow(const SkPath& path,

‎display_list/benchmarking/dl_complexity_helper.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ class ComplexityCalculatorHelper
146146
}
147147

148148
void drawImageRect(
149-
const sk_sp<DlImage>& image,
149+
const sk_sp<DlImage> image,
150150
const SkRect& src,
151151
const SkRect& dst,
152152
DlImageSampling sampling,
@@ -159,7 +159,7 @@ class ComplexityCalculatorHelper
159159
render_with_attributes, constraint == SrcRectConstraint::kStrict);
160160
}
161161

162-
void drawAtlas(const sk_sp<DlImage>& atlas,
162+
void drawAtlas(const sk_sp<DlImage> atlas,
163163
const SkRSXform xform[],
164164
const SkRect tex[],
165165
const DlColor colors[],

0 commit comments

Comments
 (0)