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

Commit 847dd86

Browse files
yaakovschectmanyaakovschectman
authored
Merge branch 'main' into win_multi_bridge
2 parents f0d39ee + 7ffaec6 commit 847dd86

Some content is hidden

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

53 files changed

+261
-2060
lines changed

‎.ci.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ targets:
324324
- flutter_frontend_server/**
325325

326326
- name: Mac Android AOT Engine
327+
bringup: true
327328
recipe: engine/engine
328329
properties:
329330
android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee

‎DEPS‎

Lines changed: 1 addition & 1 deletion
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': 'd9e216e6222341fc2c3fc3f234a0c9d213e5aab0',
21+
'skia_revision': '476ee3fd54ccb6955904f9dc3ce72a3ed05bf1a8',
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.

‎ci/builders/mac_android_aot_engine.json‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"include_paths": [
99
"out/android_profile/zip_archives/android-arm-profile/darwin-x64.zip"
1010
],
11-
"name": "android_profile"
11+
"name": "android_profile",
12+
"realm": "production"
1213
}
1314
],
1415
"drone_dimensions": [
@@ -42,7 +43,8 @@
4243
"include_paths": [
4344
"out/android_profile_arm64/zip_archives/android-arm64-profile/darwin-x64.zip"
4445
],
45-
"name": "android_profile_arm64"
46+
"name": "android_profile_arm64",
47+
"realm": "production"
4648
}
4749
],
4850
"drone_dimensions": [
@@ -77,7 +79,8 @@
7779
"include_paths": [
7880
"out/android_profile_x64/zip_archives/android-x64-profile/darwin-x64.zip"
7981
],
80-
"name": "android_profile_x64"
82+
"name": "android_profile_x64",
83+
"realm": "production"
8184
}
8285
],
8386
"drone_dimensions": [
@@ -112,7 +115,8 @@
112115
"include_paths": [
113116
"out/android_release/zip_archives/android-arm-release/darwin-x64.zip"
114117
],
115-
"name": "android_release"
118+
"name": "android_release",
119+
"realm": "production"
116120
}
117121
],
118122
"drone_dimensions": [
@@ -146,7 +150,8 @@
146150
"include_paths": [
147151
"out/android_release_arm64/zip_archives/android-arm64-release/darwin-x64.zip"
148152
],
149-
"name": "android_release_arm64"
153+
"name": "android_release_arm64",
154+
"realm": "production"
150155
}
151156
],
152157
"drone_dimensions": [
@@ -181,7 +186,8 @@
181186
"include_paths": [
182187
"out/android_release_x64/zip_archives/android-x64-release/darwin-x64.zip"
183188
],
184-
"name": "android_release_x64"
189+
"name": "android_release_x64",
190+
"realm": "production"
185191
}
186192
],
187193
"drone_dimensions": [

‎ci/licenses_golden/licenses_flutter‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1891,7 +1891,6 @@ ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/raster_cache.dart +
18911891
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/rasterizer.dart + ../../../flutter/LICENSE
18921892
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/renderer.dart + ../../../flutter/LICENSE
18931893
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/shader.dart + ../../../flutter/LICENSE
1894-
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/skia_object_cache.dart + ../../../flutter/LICENSE
18951894
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/surface.dart + ../../../flutter/LICENSE
18961895
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/surface_factory.dart + ../../../flutter/LICENSE
18971896
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/text.dart + ../../../flutter/LICENSE
@@ -4487,7 +4486,6 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/raster_cache.dart
44874486
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/rasterizer.dart
44884487
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/renderer.dart
44894488
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/shader.dart
4490-
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/skia_object_cache.dart
44914489
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/surface.dart
44924490
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/surface_factory.dart
44934491
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/text.dart

‎ci/licenses_golden/licenses_skia‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 975267d3db8b34ce059b689518c274b0
1+
Signature: 42a1373c7fe9f4eaa27dee32fb426d14
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -2342,6 +2342,7 @@ ORIGIN: ../../../third_party/skia/include/effects/SkLumaColorFilter.h + ../../..
23422342
ORIGIN: ../../../third_party/skia/include/effects/SkPerlinNoiseShader.h + ../../../third_party/skia/LICENSE
23432343
ORIGIN: ../../../third_party/skia/include/gpu/gl/GrGLExtensions.h + ../../../third_party/skia/LICENSE
23442344
ORIGIN: ../../../third_party/skia/include/ports/SkFontConfigInterface.h + ../../../third_party/skia/LICENSE
2345+
ORIGIN: ../../../third_party/skia/include/private/SkJpegMetadataDecoder.h + ../../../third_party/skia/LICENSE
23452346
ORIGIN: ../../../third_party/skia/include/private/base/SkOnce.h + ../../../third_party/skia/LICENSE
23462347
ORIGIN: ../../../third_party/skia/include/private/base/SkTFitsIn.h + ../../../third_party/skia/LICENSE
23472348
ORIGIN: ../../../third_party/skia/include/private/base/SkTLogic.h + ../../../third_party/skia/LICENSE
@@ -2483,6 +2484,7 @@ FILE: ../../../third_party/skia/include/effects/SkLumaColorFilter.h
24832484
FILE: ../../../third_party/skia/include/effects/SkPerlinNoiseShader.h
24842485
FILE: ../../../third_party/skia/include/gpu/gl/GrGLExtensions.h
24852486
FILE: ../../../third_party/skia/include/ports/SkFontConfigInterface.h
2487+
FILE: ../../../third_party/skia/include/private/SkJpegMetadataDecoder.h
24862488
FILE: ../../../third_party/skia/include/private/base/SkOnce.h
24872489
FILE: ../../../third_party/skia/include/private/base/SkTFitsIn.h
24882490
FILE: ../../../third_party/skia/include/private/base/SkTLogic.h

‎impeller/entity/contents/text_contents.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ static bool CommonRender(
157157
Vector2 screen_offset = (entity.GetTransformation() * offset).Round();
158158

159159
for (const auto& run : frame.GetRuns()) {
160-
auto font = run.GetFont();
160+
const Font& font = run.GetFont();
161161

162162
for (const auto& glyph_position : run.GetGlyphPositions()) {
163163
FontGlyphPair font_glyph_pair{font, glyph_position.glyph};

‎impeller/golden_tests/golden_digest.cc‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "impeller/golden_tests/golden_digest.h"
66

77
#include <fstream>
8+
#include <sstream>
89

910
static const double kMaxDiffPixelsPercent = 0.01;
1011
static const int32_t kMaxColorDelta = 8;
@@ -23,6 +24,13 @@ GoldenDigest* GoldenDigest::Instance() {
2324

2425
GoldenDigest::GoldenDigest() {}
2526

27+
void GoldenDigest::AddDimension(const std::string& name,
28+
const std::string& value) {
29+
std::stringstream ss;
30+
ss << "\"" << value << "\"";
31+
dimensions_[name] = ss.str();
32+
}
33+
2634
void GoldenDigest::AddImage(const std::string& test_name,
2735
const std::string& filename,
2836
int32_t width,
@@ -38,15 +46,28 @@ bool GoldenDigest::Write(WorkingDirectory* working_directory) {
3846
return false;
3947
}
4048

41-
fout << "[" << std::endl;
49+
fout << "{" << std::endl;
50+
fout << " \"dimensions\": {" << std::endl;
4251
bool is_first = true;
52+
for (const auto& dimension : dimensions_) {
53+
if (!is_first) {
54+
fout << "," << std::endl;
55+
}
56+
is_first = false;
57+
fout << " \"" << dimension.first << "\": " << dimension.second;
58+
}
59+
fout << std::endl << " }," << std::endl;
60+
fout << " \"entries\":" << std::endl;
61+
62+
fout << " [" << std::endl;
63+
is_first = true;
4364
for (const auto& entry : entries_) {
4465
if (!is_first) {
4566
fout << "," << std::endl;
4667
}
4768
is_first = false;
4869

49-
fout << " { "
70+
fout << " { "
5071
<< "\"testName\" : \"" << entry.test_name << "\", "
5172
<< "\"filename\" : \"" << entry.filename << "\", "
5273
<< "\"width\" : " << entry.width << ", "
@@ -64,7 +85,9 @@ bool GoldenDigest::Write(WorkingDirectory* working_directory) {
6485
fout << "\"maxColorDelta\":" << entry.max_color_delta << " ";
6586
fout << "}";
6687
}
67-
fout << std::endl << "]" << std::endl;
88+
fout << std::endl << " ]" << std::endl;
89+
90+
fout << "}" << std::endl;
6891

6992
fout.close();
7093
return true;

‎impeller/golden_tests/golden_digest.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#pragma once
66

7+
#include <map>
78
#include <string>
89
#include <vector>
910

@@ -18,6 +19,8 @@ class GoldenDigest {
1819
public:
1920
static GoldenDigest* Instance();
2021

22+
void AddDimension(const std::string& name, const std::string& value);
23+
2124
void AddImage(const std::string& test_name,
2225
const std::string& filename,
2326
int32_t width,
@@ -42,6 +45,7 @@ class GoldenDigest {
4245

4346
static GoldenDigest* instance_;
4447
std::vector<Entry> entries_;
48+
std::map<std::string, std::string> dimensions_;
4549
};
4650
} // namespace testing
4751
} // namespace impeller

‎impeller/golden_tests/golden_playground_test_mac.cc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ void GoldenPlaygroundTest::SetUp() {
7878
"GoldenPlaygroundTest doesn't support interactive playground tests "
7979
"yet.");
8080
}
81+
82+
testing::GoldenDigest::Instance()->AddDimension(
83+
"gpu_string", GetContext()->DescribeGpuModel());
8184
}
8285

8386
PlaygroundBackend GoldenPlaygroundTest::GetBackend() const {

‎impeller/golden_tests/golden_tests.cc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ class GoldenTests : public ::testing::Test {
5252

5353
MetalScreenshoter& Screenshoter() { return *screenshoter_; }
5454

55+
void SetUp() override {
56+
testing::GoldenDigest::Instance()->AddDimension(
57+
"gpu_string",
58+
Screenshoter().GetContext().GetContext()->DescribeGpuModel());
59+
}
60+
5561
private:
5662
std::unique_ptr<MetalScreenshoter> screenshoter_;
5763
};

0 commit comments

Comments
 (0)