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

Commit 8150a3d

Browse files
dkwingsmtdkwingsmt
committed
Merge remote-tracking branch 'origin/main' into revert-50985-revert-reland-4-mv-pipeline
2 parents 7ce9727 + e77fa74 commit 8150a3d

Some content is hidden

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

60 files changed

+1199
-620
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
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': 'f65ecbdfb09c1c7db93e94443b2df365e33b65a3',
17+
'skia_revision': '453cb0d0458496936b5bfbc25fd6043f3f048a61',
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.

‎build/concurrent_jobs.gni‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎build/dart/BUILD.gn‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
import("//flutter/build/concurrent_jobs.gni")
65
import("//flutter/build/dart/dart.gni")
76
import("//flutter/common/config.gni")
87

@@ -12,7 +11,7 @@ declare_args() {
1211
# Maximum number of Dart processes to run in parallel.
1312
#
1413
# To avoid out-of-memory errors we explicitly reduce the number of jobs.
15-
concurrent_dart_jobs = concurrent_jobs.dart
14+
concurrent_dart_jobs = 1
1615
}
1716

1817
pool("dart_pool") {

‎build/get_concurrent_jobs.py‎

Lines changed: 0 additions & 130 deletions
This file was deleted.

‎ci/builders/linux_unopt.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@
9494
{
9595
"name": "Check build configs",
9696
"script": "flutter/ci/check_build_configs.sh"
97+
},
98+
{
99+
"name": "Tests of tools/gn",
100+
"language": "python3",
101+
"script": "flutter/tools/gn_test.py"
97102
}
98103
]
99104
},

‎ci/builders/mac_unopt.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@
4444
"dart,dart-host,engine",
4545
"--engine-capture-core-dump"
4646
]
47+
},
48+
{
49+
"name": "Tests of tools/gn",
50+
"language": "python3",
51+
"script": "flutter/tools/gn_test.py"
4752
}
4853
]
4954
},

‎ci/builders/standalone/windows_unopt.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@
3737
"engine",
3838
"--engine-capture-core-dump"
3939
]
40+
},
41+
{
42+
"name": "Tests of tools/gn",
43+
"language": "python3",
44+
"script": "flutter/tools/gn_test.py"
4045
}
4146
]
4247
}

‎ci/licenses_golden/licenses_flutter‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35661,7 +35661,6 @@ ORIGIN: ../../../flutter/lib/ui/text/asset_manager_font_provider.cc + ../../../f
3566135661
ORIGIN: ../../../flutter/lib/ui/text/asset_manager_font_provider.h + ../../../flutter/LICENSE
3566235662
ORIGIN: ../../../flutter/lib/ui/text/font_collection.cc + ../../../flutter/LICENSE
3566335663
ORIGIN: ../../../flutter/lib/ui/text/font_collection.h + ../../../flutter/LICENSE
35664-
ORIGIN: ../../../flutter/lib/ui/text/line_metrics.h + ../../../flutter/LICENSE
3566535664
ORIGIN: ../../../flutter/lib/ui/text/paragraph.cc + ../../../flutter/LICENSE
3566635665
ORIGIN: ../../../flutter/lib/ui/text/paragraph.h + ../../../flutter/LICENSE
3566735666
ORIGIN: ../../../flutter/lib/ui/text/paragraph_builder.cc + ../../../flutter/LICENSE
@@ -36291,8 +36290,11 @@ ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/Platf
3629136290
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewWrapper.java + ../../../flutter/LICENSE
3629236291
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsAccessibilityDelegate.java + ../../../flutter/LICENSE
3629336292
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java + ../../../flutter/LICENSE
36293+
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/SingleViewFakeWindowViewGroup.java + ../../../flutter/LICENSE
3629436294
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java + ../../../flutter/LICENSE
36295+
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/SingleViewWindowManager.java + ../../../flutter/LICENSE
3629536296
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/VirtualDisplayController.java + ../../../flutter/LICENSE
36297+
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/WindowManagerHandler.java + ../../../flutter/LICENSE
3629636298
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/text/ProcessTextPlugin.java + ../../../flutter/LICENSE
3629736299
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/util/HandlerCompat.java + ../../../flutter/LICENSE
3629836300
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/util/PathUtils.java + ../../../flutter/LICENSE
@@ -38510,7 +38512,6 @@ FILE: ../../../flutter/lib/ui/text/asset_manager_font_provider.cc
3851038512
FILE: ../../../flutter/lib/ui/text/asset_manager_font_provider.h
3851138513
FILE: ../../../flutter/lib/ui/text/font_collection.cc
3851238514
FILE: ../../../flutter/lib/ui/text/font_collection.h
38513-
FILE: ../../../flutter/lib/ui/text/line_metrics.h
3851438515
FILE: ../../../flutter/lib/ui/text/paragraph.cc
3851538516
FILE: ../../../flutter/lib/ui/text/paragraph.h
3851638517
FILE: ../../../flutter/lib/ui/text/paragraph_builder.cc
@@ -39152,10 +39153,13 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/Platfor
3915239153
FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewWrapper.java
3915339154
FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsAccessibilityDelegate.java
3915439155
FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java
39156+
FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/SingleViewFakeWindowViewGroup.java
3915539157
FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java
39158+
FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/SingleViewWindowManager.java
3915639159
FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/SurfaceProducerPlatformViewRenderTarget.java
3915739160
FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/SurfaceTexturePlatformViewRenderTarget.java
3915839161
FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/VirtualDisplayController.java
39162+
FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/WindowManagerHandler.java
3915939163
FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/text/ProcessTextPlugin.java
3916039164
FILE: ../../../flutter/shell/platform/android/io/flutter/util/HandlerCompat.java
3916139165
FILE: ../../../flutter/shell/platform/android/io/flutter/util/PathUtils.java

‎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: 726e35dfaaa477ebc19e0abbc02aee9d
1+
Signature: 52aec7e2d2dfcd6940f4ee30515c8838
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -328,6 +328,7 @@ TYPE: LicenseType.bsd
328328
FILE: ../../../flutter/third_party/skia/.bazelignore
329329
FILE: ../../../flutter/third_party/skia/.bazelproject
330330
FILE: ../../../flutter/third_party/skia/Cargo.toml
331+
FILE: ../../../flutter/third_party/skia/OWNERS_build_files.android
331332
FILE: ../../../flutter/third_party/skia/RELEASE_NOTES.md
332333
FILE: ../../../flutter/third_party/skia/go.mod
333334
FILE: ../../../flutter/third_party/skia/go.sum

‎impeller/aiks/picture.cc‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,15 @@ std::shared_ptr<Texture> Picture::RenderToTexture(
6666
/*mip_count=*/1,
6767
"Picture Snapshot MSAA", // label
6868
RenderTarget::
69-
kDefaultColorAttachmentConfigMSAA, // color_attachment_config
70-
std::nullopt // stencil_attachment_config
69+
kDefaultColorAttachmentConfigMSAA // color_attachment_config
7170
);
7271
} else {
7372
target = render_target_allocator.CreateOffscreen(
7473
*impeller_context, // context
7574
size, // size
7675
/*mip_count=*/1,
77-
"Picture Snapshot", // label
78-
RenderTarget::kDefaultColorAttachmentConfig, // color_attachment_config
79-
std::nullopt // stencil_attachment_config
76+
"Picture Snapshot", // label
77+
RenderTarget::kDefaultColorAttachmentConfig // color_attachment_config
8078
);
8179
}
8280
if (!target.IsValid()) {

0 commit comments

Comments
 (0)