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

Commit da352d0

Browse files
authored
Revert "Track detailed LibTxt metrics with LineMetrics(#10127)" (#10982)
This reverts commit 8682aaf.
1 parent 23700fc commit da352d0

File tree

8 files changed

+141
-658
lines changed

8 files changed

+141
-658
lines changed

ci/licenses_golden/licenses_flutter

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,6 @@ FILE: ../../../flutter/third_party/txt/src/txt/font_skia.cc
11161116
FILE: ../../../flutter/third_party/txt/src/txt/font_skia.h
11171117
FILE: ../../../flutter/third_party/txt/src/txt/font_style.h
11181118
FILE: ../../../flutter/third_party/txt/src/txt/font_weight.h
1119-
FILE: ../../../flutter/third_party/txt/src/txt/line_metrics.h
11201119
FILE: ../../../flutter/third_party/txt/src/txt/paint_record.cc
11211120
FILE: ../../../flutter/third_party/txt/src/txt/paint_record.h
11221121
FILE: ../../../flutter/third_party/txt/src/txt/paragraph.h
@@ -1130,7 +1129,6 @@ FILE: ../../../flutter/third_party/txt/src/txt/paragraph_txt.cc
11301129
FILE: ../../../flutter/third_party/txt/src/txt/paragraph_txt.h
11311130
FILE: ../../../flutter/third_party/txt/src/txt/placeholder_run.cc
11321131
FILE: ../../../flutter/third_party/txt/src/txt/placeholder_run.h
1133-
FILE: ../../../flutter/third_party/txt/src/txt/run_metrics.h
11341132
FILE: ../../../flutter/third_party/txt/src/txt/styled_runs.cc
11351133
FILE: ../../../flutter/third_party/txt/src/txt/styled_runs.h
11361134
FILE: ../../../flutter/third_party/txt/src/txt/test_font_manager.cc

third_party/txt/BUILD.gn

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ source_set("txt") {
8787
"src/txt/font_skia.h",
8888
"src/txt/font_style.h",
8989
"src/txt/font_weight.h",
90-
"src/txt/line_metrics.h",
9190
"src/txt/paint_record.cc",
9291
"src/txt/paint_record.h",
9392
"src/txt/paragraph.h",
@@ -102,7 +101,6 @@ source_set("txt") {
102101
"src/txt/placeholder_run.cc",
103102
"src/txt/placeholder_run.h",
104103
"src/txt/platform.h",
105-
"src/txt/run_metrics.h",
106104
"src/txt/styled_runs.cc",
107105
"src/txt/styled_runs.h",
108106
"src/txt/test_font_manager.cc",

third_party/txt/src/txt/line_metrics.h

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

third_party/txt/src/txt/paragraph.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/*
32
* Copyright 2017 Google Inc.
43
*
@@ -18,7 +17,6 @@
1817
#ifndef LIB_TXT_SRC_PARAGRAPH_H_
1918
#define LIB_TXT_SRC_PARAGRAPH_H_
2019

21-
#include "line_metrics.h"
2220
#include "paragraph_style.h"
2321

2422
class SkCanvas;
@@ -173,8 +171,6 @@ class Paragraph {
173171
// Finds the first and last glyphs that define a word containing the glyph at
174172
// index offset.
175173
virtual Range<size_t> GetWordBoundary(size_t offset) = 0;
176-
177-
virtual std::vector<LineMetrics>& GetLineMetrics() = 0;
178174
};
179175

180176
} // namespace txt

0 commit comments

Comments
 (0)