diff options
Diffstat (limited to 'ui/gfx/font_list.cc')
-rw-r--r-- | ui/gfx/font_list.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ui/gfx/font_list.cc b/ui/gfx/font_list.cc index f9b34a6..7bdf903 100644 --- a/ui/gfx/font_list.cc +++ b/ui/gfx/font_list.cc @@ -34,17 +34,15 @@ bool FontList::ParseDescription(const std::string& description, DCHECK(style_out); DCHECK(size_pixels_out); - *families_out = base::SplitString( - description, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); + base::SplitString(description, ',', families_out); if (families_out->empty()) return false; for (auto& family : *families_out) base::TrimWhitespaceASCII(family, base::TRIM_ALL, &family); // The last item is "[STYLE1] [STYLE2] [...] SIZE". - std::vector<std::string> styles = base::SplitString( - families_out->back(), base::kWhitespaceASCII, - base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY); + std::vector<std::string> styles; + base::SplitStringAlongWhitespace(families_out->back(), &styles); families_out->pop_back(); if (styles.empty()) return false; |