Skip to content

Commit 47a710b

Browse files
jason-simmonsjason-simmons
authored
Move flutter/third_party/txt into flutter/txt (flutter#164248)
The flutter/txt library does not currently contain any third-party code.
1 parent 6da9f78 commit 47a710b

File tree

119 files changed

+814
-1285
lines changed

Some content is hidden

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

119 files changed

+814
-1285
lines changed

‎engine/src/flutter/.clang-tidy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ CheckOptions:
6060
# updated.
6161
#
6262
# tl;dr: I'm sorry.
63-
HeaderFilterRegex: "[..\/]+\/flutter\/(assets|benchmarking|bin|build|ci|common|display_list|docs|examples|flow|flutter_frontend_server|flutter_vma|fml|impeller|lib|runtime|shell|skia|sky|testing|tools|vulkan|wasm|web_sdk)\/.*"
63+
HeaderFilterRegex: "[..\/]+\/flutter\/(assets|benchmarking|bin|build|ci|common|display_list|docs|examples|flow|flutter_frontend_server|flutter_vma|fml|impeller|lib|runtime|shell|skia|sky|testing|tools|txt|vulkan|wasm|web_sdk)\/.*"

‎engine/src/flutter/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ group("flutter") {
149149
"//flutter/impeller/geometry:geometry_benchmarks",
150150
"//flutter/lib/ui:ui_benchmarks",
151151
"//flutter/shell/common:shell_benchmarks",
152-
"//flutter/third_party/txt:txt_benchmarks",
152+
"//flutter/txt:txt_benchmarks",
153153
]
154154
}
155155

@@ -200,7 +200,7 @@ group("unittests") {
200200
"//flutter/testing/dart",
201201
"//flutter/testing/smoke_test_failure",
202202
"//flutter/third_party/tonic/tests:tonic_unittests",
203-
"//flutter/third_party/txt:txt_unittests",
203+
"//flutter/txt:txt_unittests",
204204
]
205205

206206
# The accessibility library only supports Mac and Windows at the moment.

‎engine/src/flutter/ci/builders/linux_host_engine_test.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
"flutter/shell/common:shell_benchmarks",
141141
"flutter/shell/testing",
142142
"flutter/tools/path_ops",
143-
"flutter/third_party/txt:txt_benchmarks"
143+
"flutter/txt:txt_benchmarks"
144144
]
145145
},
146146
"tests": [

‎engine/src/flutter/ci/builders/standalone/linux_benchmarks.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"flutter/lib/ui:ui_benchmarks",
3434
"flutter/shell/common:shell_benchmarks",
3535
"flutter/shell/testing",
36-
"flutter/third_party/txt:txt_benchmarks",
36+
"flutter/txt:txt_benchmarks",
3737
"flutter/tools/path_ops",
3838
"flutter/build/archives:flutter_patched_sdk",
3939
"flutter:unittests"

‎engine/src/flutter/ci/licenses.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ function verify_licenses() (
183183
echo "double-check that all newly added files have a BSD-style license"
184184
echo "header with the following copyright:"
185185
echo " Copyright 2013 The Flutter Authors. All rights reserved."
186-
echo "Files in 'third_party/txt' may have an Apache license header instead."
187186
echo "If you're absolutely sure that the change in license count is"
188187
echo "intentional, update 'flutter/ci/licenses.sh' with the new count."
189188
echo "================================================================="

‎engine/src/flutter/ci/licenses_golden/excluded_files

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3030,11 +3030,6 @@
30303030
../../../flutter/third_party/tonic/filesystem/README.md
30313031
../../../flutter/third_party/tonic/filesystem/tests
30323032
../../../flutter/third_party/tonic/tests
3033-
../../../flutter/third_party/txt/.clang-format
3034-
../../../flutter/third_party/txt/.gitattributes
3035-
../../../flutter/third_party/txt/.gitignore
3036-
../../../flutter/third_party/txt/tests
3037-
../../../flutter/third_party/txt/third_party/fonts
30383033
../../../flutter/third_party/vulkan-deps/.git
30393034
../../../flutter/third_party/vulkan-deps/.gitattributes
30403035
../../../flutter/third_party/vulkan-deps/.gitignore
@@ -3322,6 +3317,11 @@
33223317
../../../flutter/tools/licenses/lib/README
33233318
../../../flutter/tools/licenses/pubspec.yaml
33243319
../../../flutter/tools/licenses/test
3320+
../../../flutter/txt/.clang-format
3321+
../../../flutter/txt/.gitattributes
3322+
../../../flutter/txt/.gitignore
3323+
../../../flutter/txt/tests
3324+
../../../flutter/txt/third_party/fonts
33253325
../../../flutter/web_sdk
33263326
../../../fuchsia/sdk/linux/.build-id
33273327
../../../fuchsia/sdk/linux/.versions

‎engine/src/flutter/ci/licenses_golden/licenses_flutter

Lines changed: 88 additions & 90 deletions
Large diffs are not rendered by default.

‎engine/src/flutter/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: c84f698d3be586c08f30d61b87c71a64
1+
Signature: 3e70644686476fd49381d86a050498ab
22

‎engine/src/flutter/display_list/BUILD.gn

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,7 @@ source_set("display_list") {
141141
}
142142

143143
test_fixtures("display_list_fixtures") {
144-
fixtures =
145-
[ "//flutter/third_party/txt/third_party/fonts/Roboto-Regular.ttf" ]
144+
fixtures = [ "//flutter/txt/third_party/fonts/Roboto-Regular.ttf" ]
146145
}
147146

148147
if (enable_unittests) {
@@ -207,7 +206,7 @@ if (enable_unittests) {
207206
"//flutter/display_list/testing:display_list_testing",
208207
"//flutter/impeller/typographer/backends/skia:typographer_skia_backend",
209208
"//flutter/testing",
210-
"//flutter/third_party/txt",
209+
"//flutter/txt",
211210
]
212211

213212
if (!defined(defines)) {

‎engine/src/flutter/display_list/testing/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ source_set("display_list_testing") {
1717
deps = [
1818
"//flutter/skia",
1919
"//flutter/testing:testing_lib",
20-
"//flutter/third_party/txt",
20+
"//flutter/txt",
2121
]
2222

2323
public_deps = [ "//flutter/display_list:display_list" ]

‎engine/src/flutter/flow/BUILD.gn

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ source_set("flow") {
9999
"//flutter/common/graphics",
100100
"//flutter/display_list",
101101
"//flutter/fml",
102-
"//flutter/third_party/txt",
102+
"//flutter/txt",
103103
]
104104

105105
deps = [ "//flutter/skia" ]
@@ -114,8 +114,7 @@ source_set("flow") {
114114

115115
if (enable_unittests) {
116116
test_fixtures("flow_fixtures") {
117-
fixtures =
118-
[ "//flutter/third_party/txt/third_party/fonts/Roboto-Regular.ttf" ]
117+
fixtures = [ "//flutter/txt/third_party/fonts/Roboto-Regular.ttf" ]
119118
}
120119

121120
source_set("flow_testing") {

‎engine/src/flutter/flow/flow_run_all_unittests.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ int main(int argc, char** argv) {
2323
cmd.GetOptionValueWithDefault("golden-dir", "flutter/testing/resources"));
2424
#endif
2525
flutter::SetFontFile(cmd.GetOptionValueWithDefault(
26-
"font-file",
27-
"flutter/third_party/txt/third_party/fonts/Roboto-Regular.ttf"));
26+
"font-file", "flutter/txt/third_party/fonts/Roboto-Regular.ttf"));
2827
return RUN_ALL_TESTS();
2928
}

‎engine/src/flutter/impeller/display_list/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ template("display_list_unittests_component") {
106106
":display_list",
107107
"../playground:playground_test",
108108
"//flutter/impeller/golden_tests:screenshot",
109-
"//flutter/third_party/txt",
109+
"//flutter/txt",
110110
]
111111
if (defined(invoker.public_configs)) {
112112
public_configs = invoker.public_configs
@@ -182,7 +182,7 @@ template("aiks_unittests_component") {
182182
"//flutter/impeller/golden_tests:golden_playground_test",
183183
"//flutter/impeller/playground:playground_test",
184184
"//flutter/testing:testing_lib",
185-
"//flutter/third_party/txt",
185+
"//flutter/txt",
186186
]
187187
if (defined(invoker.public_configs)) {
188188
public_configs = invoker.public_configs

‎engine/src/flutter/impeller/entity/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,6 @@ impeller_component("entity_unittests") {
273273
"../playground:playground_test",
274274
"//flutter/display_list/testing:display_list_testing",
275275
"//flutter/impeller/typographer/backends/skia:typographer_skia_backend",
276-
"//flutter/third_party/txt",
276+
"//flutter/txt",
277277
]
278278
}

‎engine/src/flutter/impeller/fixtures/BUILD.gn

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@ impellerc("runtime_stages") {
102102

103103
test_fixtures("file_fixtures") {
104104
fixtures = [
105-
"//flutter/third_party/txt/third_party/fonts/ahem.ttf",
106-
"//flutter/third_party/txt/third_party/fonts/HomemadeApple.ttf",
107-
"//flutter/third_party/txt/third_party/fonts/NotoColorEmoji.ttf",
108-
"//flutter/third_party/txt/third_party/fonts/Roboto-Medium.ttf",
109-
"//flutter/third_party/txt/third_party/fonts/Roboto-Regular.ttf",
105+
"//flutter/txt/third_party/fonts/ahem.ttf",
106+
"//flutter/txt/third_party/fonts/HomemadeApple.ttf",
107+
"//flutter/txt/third_party/fonts/NotoColorEmoji.ttf",
108+
"//flutter/txt/third_party/fonts/Roboto-Medium.ttf",
109+
"//flutter/txt/third_party/fonts/Roboto-Regular.ttf",
110110
"airplane.jpg",
111111
"bay_bridge.jpg",
112112
"blend_mode_dst.png",

‎engine/src/flutter/impeller/renderer/render_pass.cc

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -267,12 +267,15 @@ bool RenderPass::BindDynamicResource(ShaderStage stage,
267267
return BindBuffer(stage, slot, std::move(resouce));
268268
}
269269

270-
bool RenderPass::BindDynamicResource(ShaderStage stage,
271-
DescriptorType type,
272-
const SampledImageSlot& slot,
273-
std::unique_ptr<ShaderMetadata> metadata,
274-
std::shared_ptr<const Texture> texture,
275-
raw_ptr<const Sampler> sampler) {
270+
bool RenderPass::BindDynamicResource(
271+
ShaderStage stage,
272+
DescriptorType type,
273+
const SampledImageSlot& slot,
274+
std::unique_ptr<ShaderMetadata> metadata,
275+
std::shared_ptr<const Texture> texture,
276+
raw_ptr<const Sampler>
277+
sampler // NOLINT(performance-unnecessary-value-param)
278+
) {
276279
if (!sampler) {
277280
return false;
278281
}
@@ -303,6 +306,7 @@ bool RenderPass::BindTexture(ShaderStage stage,
303306
TextureAndSampler data = TextureAndSampler{
304307
.stage = stage,
305308
.texture = std::move(resource),
309+
// NOLINTNEXTLINE(performance-move-const-arg)
306310
.sampler = sampler,
307311
};
308312

‎engine/src/flutter/impeller/toolkit/interop/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impeller_component("interop_base") {
7676
"../../renderer/backend",
7777
"//flutter/display_list",
7878
"//flutter/fml",
79-
"//flutter/third_party/txt",
79+
"//flutter/txt",
8080
]
8181
}
8282

‎engine/src/flutter/impeller/toolkit/interop/formats.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
#include "flutter/display_list/dl_builder.h"
1111
#include "flutter/display_list/dl_color.h"
12-
#include "flutter/third_party/txt/src/txt/font_style.h"
13-
#include "flutter/third_party/txt/src/txt/font_weight.h"
14-
#include "flutter/third_party/txt/src/txt/paragraph_style.h"
12+
#include "flutter/txt/src/txt/font_style.h"
13+
#include "flutter/txt/src/txt/font_weight.h"
14+
#include "flutter/txt/src/txt/paragraph_style.h"
1515
#include "impeller/entity/entity.h"
1616
#include "impeller/geometry/color.h"
1717
#include "impeller/geometry/matrix.h"

‎engine/src/flutter/impeller/toolkit/interop/paragraph.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef FLUTTER_IMPELLER_TOOLKIT_INTEROP_PARAGRAPH_H_
66
#define FLUTTER_IMPELLER_TOOLKIT_INTEROP_PARAGRAPH_H_
77

8-
#include "flutter/third_party/txt/src/txt/paragraph.h"
8+
#include "flutter/txt/src/txt/paragraph.h"
99
#include "impeller/toolkit/interop/impeller.h"
1010
#include "impeller/toolkit/interop/object.h"
1111

‎engine/src/flutter/impeller/toolkit/interop/paragraph_builder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "impeller/toolkit/interop/paragraph_builder.h"
66

7-
#include "flutter/third_party/txt/src/skia/paragraph_builder_skia.h"
7+
#include "flutter/txt/src/skia/paragraph_builder_skia.h"
88
#include "impeller/base/validation.h"
99
#include "impeller/toolkit/interop/paragraph.h"
1010

‎engine/src/flutter/impeller/toolkit/interop/paragraph_builder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include <memory>
99

10-
#include "flutter/third_party/txt/src/txt/paragraph_builder.h"
10+
#include "flutter/txt/src/txt/paragraph_builder.h"
1111
#include "impeller/toolkit/interop/impeller.h"
1212
#include "impeller/toolkit/interop/object.h"
1313
#include "impeller/toolkit/interop/paragraph.h"

‎engine/src/flutter/impeller/toolkit/interop/paragraph_style.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
#ifndef FLUTTER_IMPELLER_TOOLKIT_INTEROP_PARAGRAPH_STYLE_H_
66
#define FLUTTER_IMPELLER_TOOLKIT_INTEROP_PARAGRAPH_STYLE_H_
77

8+
#include "flutter/txt/src/txt/paragraph_style.h"
89
#include "impeller/toolkit/interop/impeller.h"
910
#include "impeller/toolkit/interop/object.h"
1011
#include "impeller/toolkit/interop/paint.h"
11-
#include "third_party/txt/src/txt/paragraph_style.h"
1212

1313
namespace impeller::interop {
1414

‎engine/src/flutter/impeller/toolkit/interop/typography_context.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <mutex>
88

99
#include "flutter/fml/icu_util.h"
10-
#include "flutter/third_party/txt/src/txt/platform.h"
10+
#include "flutter/txt/src/txt/platform.h"
1111
#include "impeller/base/validation.h"
1212
#include "impeller/toolkit/interop/embedded_icu_data.h"
1313

‎engine/src/flutter/impeller/toolkit/interop/typography_context.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <memory>
99

1010
#include "flutter/third_party/skia/modules/skparagraph/include/TypefaceFontProvider.h"
11-
#include "flutter/third_party/txt/src/txt/font_collection.h"
11+
#include "flutter/txt/src/txt/font_collection.h"
1212
#include "impeller/toolkit/interop/impeller.h"
1313
#include "impeller/toolkit/interop/object.h"
1414

‎engine/src/flutter/impeller/typographer/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ impeller_component("typographer_unittests") {
5151
"../playground:playground_test",
5252
"backends/skia:typographer_skia_backend",
5353
"//flutter/display_list/testing:display_list_testing",
54-
"//flutter/third_party/txt",
54+
"//flutter/txt",
5555
]
5656
}

‎engine/src/flutter/lib/ui/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ source_set("ui") {
169169
"//flutter/shell/common:display",
170170
"//flutter/shell/common:platform_message_handler",
171171
"//flutter/skia/modules/skparagraph",
172-
"//flutter/third_party/txt",
172+
"//flutter/txt",
173173
]
174174

175175
deps = [
@@ -230,7 +230,7 @@ if (enable_unittests) {
230230
"fixtures/FontManifest.json",
231231
"fixtures/unmultiplied_alpha.png",
232232
"fixtures/WideGamutIndexed.png",
233-
"//flutter/third_party/txt/third_party/fonts/Roboto-Medium.ttf",
233+
"//flutter/txt/third_party/fonts/Roboto-Medium.ttf",
234234
]
235235
}
236236

‎engine/src/flutter/lib/ui/text/paragraph.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "flutter/fml/message_loop.h"
99
#include "flutter/lib/ui/dart_wrapper.h"
1010
#include "flutter/lib/ui/painting/canvas.h"
11-
#include "flutter/third_party/txt/src/txt/paragraph.h"
11+
#include "flutter/txt/src/txt/paragraph.h"
1212

1313
namespace flutter {
1414

‎engine/src/flutter/lib/ui/text/paragraph_builder.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
#include "flutter/lib/ui/text/font_collection.h"
1414
#include "flutter/lib/ui/ui_dart_state.h"
1515
#include "flutter/lib/ui/window/platform_configuration.h"
16-
#include "flutter/third_party/txt/src/txt/font_style.h"
17-
#include "flutter/third_party/txt/src/txt/font_weight.h"
18-
#include "flutter/third_party/txt/src/txt/paragraph_style.h"
19-
#include "flutter/third_party/txt/src/txt/text_baseline.h"
20-
#include "flutter/third_party/txt/src/txt/text_decoration.h"
21-
#include "flutter/third_party/txt/src/txt/text_style.h"
16+
#include "flutter/txt/src/txt/font_style.h"
17+
#include "flutter/txt/src/txt/font_weight.h"
18+
#include "flutter/txt/src/txt/paragraph_style.h"
19+
#include "flutter/txt/src/txt/text_baseline.h"
20+
#include "flutter/txt/src/txt/text_decoration.h"
21+
#include "flutter/txt/src/txt/text_style.h"
2222
#include "third_party/icu/source/common/unicode/ustring.h"
2323
#include "third_party/skia/include/core/SkColor.h"
2424
#include "third_party/tonic/converter/dart_converter.h"

‎engine/src/flutter/lib/ui/text/paragraph_builder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "flutter/lib/ui/dart_wrapper.h"
1111
#include "flutter/lib/ui/painting/paint.h"
1212
#include "flutter/lib/ui/text/paragraph.h"
13-
#include "flutter/third_party/txt/src/txt/paragraph_builder.h"
13+
#include "flutter/txt/src/txt/paragraph_builder.h"
1414
#include "third_party/tonic/typed_data/typed_list.h"
1515

1616
namespace flutter {

‎engine/src/flutter/lib/web_ui/dev/steps/copy_artifacts_step.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ class CopyArtifactsStep implements PipelineStep {
132132

133133
final String fontsPath = pathlib.join(
134134
environment.flutterDirectory.path,
135-
'third_party',
136135
'txt',
137136
'third_party',
138137
'fonts',

‎engine/src/flutter/runtime/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ source_set("test_font") {
1212
]
1313
deps = [
1414
"//flutter/skia",
15-
"//flutter/third_party/txt",
15+
"//flutter/txt",
1616
]
1717
public_configs = [ "//flutter:config" ]
1818
defines = []
@@ -116,7 +116,7 @@ source_set("runtime") {
116116
"//flutter/shell/common:display",
117117
"//flutter/skia",
118118
"//flutter/third_party/tonic",
119-
"//flutter/third_party/txt",
119+
"//flutter/txt",
120120
]
121121

122122
if (flutter_runtime_mode != "release" && !is_fuchsia) {

‎engine/src/flutter/shell/common/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ source_set("common") {
135135
"//flutter/shell/version",
136136
"//flutter/third_party/rapidjson",
137137
"//flutter/third_party/tonic",
138-
"//flutter/third_party/txt",
138+
"//flutter/txt",
139139
]
140140

141141
deps = [
@@ -205,7 +205,7 @@ if (enable_unittests) {
205205
fixtures = [
206206
"fixtures/shelltest_screenshot.png",
207207
"fixtures/hello_loop_2.gif",
208-
"//flutter/third_party/txt/third_party/fonts/Roboto-Regular.ttf",
208+
"//flutter/txt/third_party/fonts/Roboto-Regular.ttf",
209209
]
210210
}
211211

0 commit comments

Comments
 (0)