File tree 5 files changed +4
-104
lines changed
third_party/accessibility/base 5 files changed +4
-104
lines changed Original file line number Diff line number Diff line change @@ -2109,8 +2109,6 @@ FILE: ../../../flutter/third_party/accessibility/base/simple_token.h
2109
2109
FILE: ../../../flutter/third_party/accessibility/base/string_utils.cc
2110
2110
FILE: ../../../flutter/third_party/accessibility/base/string_utils.h
2111
2111
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
2114
2112
FILE: ../../../flutter/third_party/accessibility/gfx/transform.cc
2115
2113
FILE: ../../../flutter/third_party/accessibility/gfx/transform.h
2116
2114
FILE: ../../../flutter/third_party/tonic/common/build_config.h
Original file line number Diff line number Diff line change @@ -35,8 +35,6 @@ source_set("base") {
35
35
" win/scoped_safearray.h" ,
36
36
" win/scoped_variant.cc" ,
37
37
" win/scoped_variant.h" ,
38
- " win/string_conversion.cc" ,
39
- " win/string_conversion.h" ,
40
38
" win/variant_util.h" ,
41
39
" win/variant_vector.cc" ,
42
40
" win/variant_vector.h" ,
@@ -52,6 +50,7 @@ source_set("base") {
52
50
53
51
public_deps = [
54
52
" numerics" ,
53
+ " //flutter/fml:string_conversion" ,
55
54
" //flutter/third_party/accessibility/ax_build" ,
56
55
" //third_party/dart/runtime/third_party/double-conversion/src:libdouble_conversion" ,
57
56
]
Original file line number Diff line number Diff line change 11
11
#include < regex>
12
12
#include < sstream>
13
13
14
+ #include " flutter/fml/string_conversion.h"
14
15
#include " third_party/dart/runtime/third_party/double-conversion/src/double-conversion.h"
15
16
16
- #if defined(_WIN32)
17
- #include " base/win/string_conversion.h"
18
- #endif
19
-
20
17
#include " no_destructor.h"
21
18
22
19
namespace base {
@@ -68,21 +65,11 @@ std::u16string ASCIIToUTF16(std::string src) {
68
65
}
69
66
70
67
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);
77
69
}
78
70
79
71
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);
86
73
}
87
74
88
75
std::u16string WideToUTF16 (const std::wstring& src) {
Load Diff This file was deleted.
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments