| Index: ui/gfx/render_text.cc
|
| diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc
|
| index 7ccaaa6131a5ece76f65603b9c3cc7f5450b4248..852fadb978c75f569c74f2285bd16d37f3dec87f 100644
|
| --- a/ui/gfx/render_text.cc
|
| +++ b/ui/gfx/render_text.cc
|
| @@ -45,11 +45,6 @@ namespace gfx {
|
|
|
| namespace {
|
|
|
| -// All chars are replaced by this char when the password style is set.
|
| -// TODO(benrg): GTK uses the first of U+25CF, U+2022, U+2731, U+273A, '*'
|
| -// that's available in the font (find_invisible_char() in gtkentry.c).
|
| -const base::char16 kPasswordReplacementChar = '*';
|
| -
|
| // Default color used for the text and cursor.
|
| const SkColor kDefaultColor = SK_ColorBLACK;
|
|
|
| @@ -430,6 +425,16 @@ RenderText::~RenderText() {
|
| }
|
|
|
| // static
|
| +// TODO(benrg): GTK uses the first of U+25CF, U+2022, U+2731, U+273A, '*'
|
| +// that's available in the font (find_invisible_char() in gtkentry.c).
|
| +// Use a bullet character on Mac.
|
| +#if defined(OS_MACOSX)
|
| +const base::char16 RenderText::kPasswordReplacementChar = 0x2022;
|
| +#else
|
| +const base::char16 RenderText::kPasswordReplacementChar = '*';
|
| +#endif
|
| +
|
| +// static
|
| RenderText* RenderText::CreateInstance() {
|
| #if defined(OS_MACOSX)
|
| static const bool use_native =
|
| @@ -1406,7 +1411,8 @@ void RenderText::OnTextAttributeChanged() {
|
| if (obscured_) {
|
| size_t obscured_text_length =
|
| static_cast<size_t>(UTF16IndexToOffset(text_, 0, text_.length()));
|
| - layout_text_.assign(obscured_text_length, kPasswordReplacementChar);
|
| + layout_text_.assign(obscured_text_length,
|
| + RenderText::kPasswordReplacementChar);
|
|
|
| if (obscured_reveal_index_ >= 0 &&
|
| obscured_reveal_index_ < static_cast<int>(text_.length())) {
|
|
|