Skip to content

Commit f55b161

Browse files
authored
[a11y] Delegate UTF8ToUTF16 to FML (#31376)
Delegates string encoding conversions between UTF-8 and UTF-16 strings in //third_party/accessibility/base to our existing implementations in FML. Issue: #98061
1 parent 7b6a7b6 commit f55b161

File tree

5 files changed

+4
-104
lines changed

5 files changed

+4
-104
lines changed

ci/licenses_golden/licenses_flutter

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2109,8 +2109,6 @@ FILE: ../../../flutter/third_party/accessibility/base/simple_token.h
21092109
FILE: ../../../flutter/third_party/accessibility/base/string_utils.cc
21102110
FILE: ../../../flutter/third_party/accessibility/base/string_utils.h
21112111
FILE: ../../../flutter/third_party/accessibility/base/string_utils_unittest.cc
2112-
FILE: ../../../flutter/third_party/accessibility/base/win/string_conversion.cc
2113-
FILE: ../../../flutter/third_party/accessibility/base/win/string_conversion.h
21142112
FILE: ../../../flutter/third_party/accessibility/gfx/transform.cc
21152113
FILE: ../../../flutter/third_party/accessibility/gfx/transform.h
21162114
FILE: ../../../flutter/third_party/tonic/common/build_config.h

third_party/accessibility/base/BUILD.gn

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ source_set("base") {
3535
"win/scoped_safearray.h",
3636
"win/scoped_variant.cc",
3737
"win/scoped_variant.h",
38-
"win/string_conversion.cc",
39-
"win/string_conversion.h",
4038
"win/variant_util.h",
4139
"win/variant_vector.cc",
4240
"win/variant_vector.h",
@@ -52,6 +50,7 @@ source_set("base") {
5250

5351
public_deps = [
5452
"numerics",
53+
"//flutter/fml:string_conversion",
5554
"//flutter/third_party/accessibility/ax_build",
5655
"//third_party/dart/runtime/third_party/double-conversion/src:libdouble_conversion",
5756
]

third_party/accessibility/base/string_utils.cc

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@
1111
#include <regex>
1212
#include <sstream>
1313

14+
#include "flutter/fml/string_conversion.h"
1415
#include "third_party/dart/runtime/third_party/double-conversion/src/double-conversion.h"
1516

16-
#if defined(_WIN32)
17-
#include "base/win/string_conversion.h"
18-
#endif
19-
2017
#include "no_destructor.h"
2118

2219
namespace base {
@@ -68,21 +65,11 @@ std::u16string ASCIIToUTF16(std::string src) {
6865
}
6966

7067
std::u16string UTF8ToUTF16(std::string src) {
71-
#if defined(_WIN32)
72-
return WideToUTF16(win::Utf16FromUtf8(src));
73-
#else
74-
std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> convert;
75-
return convert.from_bytes(src);
76-
#endif
68+
return fml::Utf8ToUtf16(src);
7769
}
7870

7971
std::string UTF16ToUTF8(std::u16string src) {
80-
#if defined(_WIN32)
81-
return win::Utf8FromUtf16(UTF16ToWide(src));
82-
#else
83-
std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> convert;
84-
return convert.to_bytes(src);
85-
#endif
72+
return fml::Utf16ToUtf8(src);
8673
}
8774

8875
std::u16string WideToUTF16(const std::wstring& src) {

third_party/accessibility/base/win/string_conversion.cc

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

third_party/accessibility/base/win/string_conversion.h

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

0 commit comments

Comments
 (0)