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

Commit 6192ea2

Browse files
mdebbarmdebbar
committed
Merge branch 'main' into implicit_view_tests
2 parents cc63cac + 0c527aa commit 6192ea2

File tree

24 files changed

+125
-43
lines changed

24 files changed

+125
-43
lines changed

‎.ci.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ targets:
6161
timeout: 60
6262
runIf:
6363
- .ci.yaml
64+
- DEPS
6465
- lib/ui/**
6566
- shell/platform/android/**
6667

‎.github/workflows/third_party_scan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
persist-credentials: false
3131
- name: "setup python"
32-
uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236
32+
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c
3333
with:
3434
python-version: '3.7.7' # install the python version needed
3535
- name: "extract and flatten deps"

‎DEPS‎

Lines changed: 13 additions & 13 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': 'e55567fceb5f51d81661c3ba2ba0b69a9b049762',
21+
'skia_revision': '053490edfa703f3433d97a299ee80f2acc93de71',
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.
@@ -66,7 +66,7 @@ vars = {
6666
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
6767
# You can use //tools/dart/create_updated_flutter_deps.py to produce
6868
# updated revision list of existing dependencies.
69-
'dart_revision': '611fca7f0c202f0f4e4404d2e5508ce6b513aae7',
69+
'dart_revision': '82c4571bb2ded15cca71862158f2a7a78ee9127f',
7070

7171
# WARNING: DO NOT EDIT MANUALLY
7272
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -80,12 +80,12 @@ vars = {
8080
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
8181
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
8282
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
83-
'dart_protobuf_rev': 'bb1977478458d070abbb4802ae73a1560233864d',
83+
'dart_protobuf_rev': '20ec6856b65b7fd6445219fdec24d90b414f7469',
8484
'dart_pub_rev': '1779628b386819675130f14326f1e8812901c48f',
8585
'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
86-
'dart_tools_rev': 'c63dcb5e93d4a222da0c52960bb6688030ddabc3',
86+
'dart_tools_rev': 'ed81684df747830de8b29e9d6e6d8f951ea6968d',
8787
'dart_watcher_rev': 'dc45f1925f66743ff29b9dcbb4693a7ec25945c5',
88-
'dart_webdev_rev': '63e09e5060813a971ec0f95472613d6958f75b95',
88+
'dart_webdev_rev': '8375cd66821550cb7a129315d97cd768c5fdd92c',
8989
'dart_webkit_inspection_protocol_rev': '667c55e6f65638592768e0325b75420e39b01d2e',
9090
'dart_yaml_edit_rev': '9b9d33c5255798c950e843efe19e6f81a225ad28',
9191
'dart_zlib_rev': '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f',
@@ -314,7 +314,7 @@ deps = {
314314
'src/third_party/boringssl':
315315
Var('dart_git') + '/boringssl_gen.git' + '@' + Var('dart_boringssl_gen_rev'),
316316

317-
'src/third_party/yapf':
317+
'src/flutter/third_party/yapf':
318318
Var('github_git') + '/google/yapf' + '@' + '212c5b5ad8e172d2d914ae454c121c89cccbcb35',
319319

320320
'src/third_party/boringssl/src':
@@ -387,7 +387,7 @@ deps = {
387387
Var('dart_git') + '/external/github.com/google/file.dart@cd3a9324f6483f313ba1f0f3ff382ea4e6982ef2',
388388

389389
'src/third_party/dart/third_party/pkg/fixnum':
390-
Var('dart_git') + '/fixnum.git@6b0888c96554136e4f4ecf03cc52359b1974ede2',
390+
Var('dart_git') + '/fixnum.git@3e08c0d7ce1a0cd832a17391444898ec610b5f89',
391391

392392
'src/third_party/dart/third_party/pkg/glob':
393393
Var('dart_git') + '/glob.git@7c9a121e92687b7ac6456ec0796eb1e5c0373d90',
@@ -402,7 +402,7 @@ deps = {
402402
Var('dart_git') + '/http_multi_server.git@ae484896624cee8b0a8a97a0fb1ea323c4c3d31f',
403403

404404
'src/third_party/dart/third_party/pkg/http_parser':
405-
Var('dart_git') + '/http_parser.git@1cf5b7c556fa76f10b1d5e8576b54bb2d6b67e24',
405+
Var('dart_git') + '/http_parser.git@224c1a9d24b46c7a9da1f09147e0e1fbda78089d',
406406

407407
'src/third_party/dart/third_party/pkg/intl':
408408
Var('dart_git') + '/intl.git@5d65e3808ce40e6282e40881492607df4e35669f',
@@ -411,7 +411,7 @@ deps = {
411411
Var('dart_git') + '/json_rpc_2.git@460545c62d12c2cd4635054e327846628288cb7e',
412412

413413
'src/third_party/dart/third_party/pkg/leak_tracker':
414-
Var('dart_git') + '/leak_tracker.git@a618a55598e94c1b58dab6ab13297a23b3a3f287',
414+
Var('dart_git') + '/leak_tracker.git@8644f8b1c78009e9149e08e0c349d06c304110a9',
415415

416416
'src/third_party/dart/third_party/pkg/logging':
417417
Var('dart_git') + '/logging.git@324a0b5fd2b49b80ea4fbe2b48aac7794000e25a',
@@ -426,7 +426,7 @@ deps = {
426426
Var('dart_git') + '/mime.git@56359b0c72e1a9a2e2b20ee5a34bacc18e113897',
427427

428428
'src/third_party/dart/third_party/pkg/mockito':
429-
Var('dart_git') + '/mockito.git@fb8a2b5731553f5ed22107e1a0f7af8918d28442',
429+
Var('dart_git') + '/mockito.git@57a7c820ffae61e3df0dbc279ad98b92751175f0',
430430

431431
'src/third_party/dart/third_party/pkg/native':
432432
Var('dart_git') + '/native.git@5aeab2915167fd24ccb1241c07516b388fda2b9b',
@@ -435,7 +435,7 @@ deps = {
435435
Var('dart_git') + '/package_config.git@33dd24659147bd7ed2fa87aeacc52d199be766b4',
436436

437437
'src/third_party/dart/third_party/pkg/path':
438-
Var('dart_git') + '/path.git@18ec71f7dde21d8518702d77215fb0b2fa45e970',
438+
Var('dart_git') + '/path.git@115ea2a4084881e7c76089a37abc01a067dfa6e3',
439439

440440
'src/third_party/dart/third_party/pkg/pool':
441441
Var('dart_git') + '/pool.git@3c1bd422da311d95b65a04a5f28de2c0e8193692',
@@ -480,7 +480,7 @@ deps = {
480480
Var('dart_git') + '/term_glyph.git@4c5a49664ee78b62c35de528cec5a9469bb84936',
481481

482482
'src/third_party/dart/third_party/pkg/test':
483-
Var('dart_git') + '/test.git@9fffb48970112ee6958200086d544eb58fbde4fc',
483+
Var('dart_git') + '/test.git@43ff5bf9e25330aec1144bf14ef2a22fc95cda57',
484484

485485
'src/third_party/dart/third_party/pkg/test_reflective_loader':
486486
Var('dart_git') + '/test_reflective_loader.git@6edf5358b53bfda487840bad1a03d089326fa08c',
@@ -715,7 +715,7 @@ deps = {
715715
'src/third_party/json':
716716
Var('flutter_git') + '/third_party/json.git' + '@' + '17d9eacd248f58b73f4d1be518ef649fe2295642',
717717

718-
'src/third_party/stb':
718+
'src/flutter/third_party/stb':
719719
Var('flutter_git') + '/third_party/stb.git' + '@' + '5736b15f7ea0ffb08dd38af21067c314d6a3aae9',
720720

721721
'src/third_party/gradle': {

‎build/secondary/third_party/stb/BUILD.gn‎ renamed to ‎build/secondary/flutter/third_party/stb/BUILD.gn‎

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

5-
source_root = "//third_party/stb"
5+
source_root = "//flutter/third_party/stb"
66

77
source_set("stb_truetype") {
88
testonly = true
@@ -11,5 +11,7 @@ source_set("stb_truetype") {
1111

1212
include_dirs = [ "$source_root" ]
1313

14-
sources = [ "//flutter/build/secondary/third_party/stb/stb_truetype_stub.cc" ]
14+
sources = [
15+
"//flutter/build/secondary/flutter/third_party/stb/stb_truetype_stub.cc",
16+
]
1517
}

‎build/secondary/third_party/stb/stb_truetype_stub.cc‎ renamed to ‎build/secondary/flutter/third_party/stb/stb_truetype_stub.cc‎

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

55
#define STB_TRUETYPE_IMPLEMENTATION
6-
#include "third_party/stb/stb_truetype.h"
6+
#include "flutter/third_party/stb/stb_truetype.h"

‎ci/licenses_golden/excluded_files‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,6 +1043,7 @@
10431043
../../../flutter/third_party/sqlite/Makefile
10441044
../../../flutter/third_party/sqlite/README.md
10451045
../../../flutter/third_party/sqlite/VERSION
1046+
../../../flutter/third_party/stb
10461047
../../../flutter/third_party/test_shaders
10471048
../../../flutter/third_party/tinygltf
10481049
../../../flutter/third_party/tonic/.clang-format
@@ -1072,6 +1073,7 @@
10721073
../../../flutter/third_party/wuffs/release/c/README.md
10731074
../../../flutter/third_party/wuffs/script
10741075
../../../flutter/third_party/wuffs/sync.txt
1076+
../../../flutter/third_party/yapf
10751077
../../../flutter/tools
10761078
../../../flutter/tools/licenses/.dart_tool
10771079
../../../flutter/tools/licenses/.gitignore
@@ -3020,7 +3022,6 @@
30203022
../../../third_party/root_certificates/certdata.pem
30213023
../../../third_party/root_certificates/certdata.txt
30223024
../../../third_party/root_certificates/codereview.settings
3023-
../../../third_party/stb
30243025
../../../third_party/swiftshader
30253026
../../../third_party/vulkan-deps/.git
30263027
../../../third_party/vulkan-deps/.gitattributes
@@ -3194,7 +3195,6 @@
31943195
../../../third_party/vulkan_memory_allocator/src
31953196
../../../third_party/vulkan_memory_allocator/tools
31963197
../../../third_party/web_dependencies/canvaskit
3197-
../../../third_party/yapf
31983198
../../../third_party/zlib/.git
31993199
../../../third_party/zlib/CMakeLists.txt
32003200
../../../third_party/zlib/DIR_METADATA

‎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: 7cda4a784ad63119dcc713d8039961d0
1+
Signature: fa0827b53a214003c14110498dcee743
22

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

‎ci/licenses_golden/licenses_skia‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: dde8839403593dbd5e31543debe363d6
1+
Signature: b3e3a0d81c7c89d74cd05b2879f175c8
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -386,7 +386,9 @@ FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/pathops.bench.js
386386
FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/perfReporter.js
387387
FILE: ../../../flutter/third_party/skia/modules/skparagraph/test.html
388388
FILE: ../../../flutter/third_party/skia/package-lock.json
389+
FILE: ../../../flutter/third_party/skia/relnotes/PDF_jpeg.md
389390
FILE: ../../../flutter/third_party/skia/relnotes/Tick.md
391+
FILE: ../../../flutter/third_party/skia/relnotes/font.md
390392
FILE: ../../../flutter/third_party/skia/src/gpu/gpu_workaround_list.txt
391393
FILE: ../../../flutter/third_party/skia/src/ports/fontations/Cargo.toml
392394
FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_compute.minified.sksl
@@ -8621,7 +8623,6 @@ ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_hardco
86218623
ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_icu4x.cpp + ../../../flutter/third_party/skia/LICENSE
86228624
ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_icu_bidi.h + ../../../flutter/third_party/skia/LICENSE
86238625
ORIGIN: ../../../flutter/third_party/skia/src/codec/SkExif.cpp + ../../../flutter/third_party/skia/LICENSE
8624-
ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegConstants.h + ../../../flutter/third_party/skia/LICENSE
86258626
ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegMultiPicture.cpp + ../../../flutter/third_party/skia/LICENSE
86268627
ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegMultiPicture.h + ../../../flutter/third_party/skia/LICENSE
86278628
ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegSegmentScan.cpp + ../../../flutter/third_party/skia/LICENSE
@@ -8671,7 +8672,6 @@ FILE: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_hardcode
86718672
FILE: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_icu4x.cpp
86728673
FILE: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_icu_bidi.h
86738674
FILE: ../../../flutter/third_party/skia/src/codec/SkExif.cpp
8674-
FILE: ../../../flutter/third_party/skia/src/codec/SkJpegConstants.h
86758675
FILE: ../../../flutter/third_party/skia/src/codec/SkJpegMultiPicture.cpp
86768676
FILE: ../../../flutter/third_party/skia/src/codec/SkJpegMultiPicture.h
86778677
FILE: ../../../flutter/third_party/skia/src/codec/SkJpegSegmentScan.cpp
@@ -8819,6 +8819,7 @@ ORIGIN: ../../../flutter/third_party/skia/src/base/SkSafeMath.cpp + ../../../flu
88198819
ORIGIN: ../../../flutter/third_party/skia/src/base/SkTime.cpp + ../../../flutter/third_party/skia/LICENSE
88208820
ORIGIN: ../../../flutter/third_party/skia/src/base/SkTime.h + ../../../flutter/third_party/skia/LICENSE
88218821
ORIGIN: ../../../flutter/third_party/skia/src/codec/SkImageGenerator_FromEncoded.cpp + ../../../flutter/third_party/skia/LICENSE
8822+
ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegConstants.h + ../../../flutter/third_party/skia/LICENSE
88228823
ORIGIN: ../../../flutter/third_party/skia/src/core/SkBitmapProcState_opts.cpp + ../../../flutter/third_party/skia/LICENSE
88238824
ORIGIN: ../../../flutter/third_party/skia/src/core/SkBitmapProcState_opts_hsw.cpp + ../../../flutter/third_party/skia/LICENSE
88248825
ORIGIN: ../../../flutter/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp + ../../../flutter/third_party/skia/LICENSE
@@ -9102,6 +9103,7 @@ FILE: ../../../flutter/third_party/skia/src/base/SkSafeMath.cpp
91029103
FILE: ../../../flutter/third_party/skia/src/base/SkTime.cpp
91039104
FILE: ../../../flutter/third_party/skia/src/base/SkTime.h
91049105
FILE: ../../../flutter/third_party/skia/src/codec/SkImageGenerator_FromEncoded.cpp
9106+
FILE: ../../../flutter/third_party/skia/src/codec/SkJpegConstants.h
91059107
FILE: ../../../flutter/third_party/skia/src/core/SkBitmapProcState_opts.cpp
91069108
FILE: ../../../flutter/third_party/skia/src/core/SkBitmapProcState_opts_hsw.cpp
91079109
FILE: ../../../flutter/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp

‎ci/licenses_golden/tool_signature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Signature: 5dbd06463802f22fb8c461c9bda734b8
1+
Signature: 9c9e9d44a47e4d85f1debd69bc795b40
22

‎impeller/typographer/backends/skia/typographer_context_skia.cc‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,20 @@ std::shared_ptr<GlyphAtlas> TypographerContextSkia::CreateGlyphAtlas(
446446
}
447447
atlas_context_skia.UpdateBitmap(bitmap);
448448

449+
// If the new atlas size is the same size as the previous texture, reuse the
450+
// texture and treat this as an updated that replaces all glyphs.
451+
if (last_atlas && last_atlas->GetTexture()) {
452+
std::shared_ptr<Texture> last_texture = last_atlas->GetTexture();
453+
if (atlas_size == last_texture->GetSize()) {
454+
if (!UpdateGlyphTextureAtlas(bitmap, last_texture)) {
455+
return nullptr;
456+
}
457+
458+
glyph_atlas->SetTexture(last_texture);
459+
return glyph_atlas;
460+
}
461+
}
462+
449463
// ---------------------------------------------------------------------------
450464
// Step 7b: Upload the atlas as a texture.
451465
// ---------------------------------------------------------------------------

0 commit comments

Comments
 (0)