MacViews: Use bullets for displaying obscured text.

ui/gfx/render_text.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/render_text.h"
 
 #include <limits.h>
 
 #include <algorithm>
 #include <climits>
@@ skipping 27 matching lines @@
 
 #if defined(OS_MACOSX)
 #include "third_party/skia/include/ports/SkTypeface_mac.h"
 #include "ui/gfx/render_text_mac.h"
 #endif  // defined(OS_MACOSX)
 
 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;
 
 // Default color used for drawing selection background.
 const SkColor kDefaultSelectionBackgroundColor = SK_ColorGRAY;
 
 // Fraction of the text size to lower a strike through below the baseline.
 const SkScalar kStrikeThroughOffset = (-SK_Scalar1 * 6 / 21);
 // Fraction of the text size to lower an underline below the baseline.
 const SkScalar kUnderlineOffset = (SK_Scalar1 / 9);
@@ skipping 360 matching lines @@
   paint->setAutohinted(params.autohinter);
   paint->setHinting(FontRenderParamsHintingToSkPaintHinting(params.hinting));
 }
 
 }  // namespace internal
 
 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 =
       !base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableHarfBuzzRenderText);
   if (use_native)
     return new RenderTextMac;
 #endif  // defined(OS_MACOSX)
   return new RenderTextHarfBuzz;
 }
@@ skipping 956 matching lines @@
 
 void RenderText::OnTextAttributeChanged() {
   layout_text_.clear();
   display_text_.clear();
   text_elided_ = false;
   line_breaks_.SetMax(0);
 
   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())) {
       // Gets the index range in |text_| to be revealed.
       size_t start = obscured_reveal_index_;
       U16_SET_CP_START(text_.data(), 0, start);
       size_t end = start;
       UChar32 unused_char;
       U16_NEXT(text_.data(), end, text_.length(), unused_char);
 
@@ skipping 264 matching lines @@
 
   for (; range_max < length; ++range_max)
     if (iter.IsEndOfWord(range_max) || iter.IsStartOfWord(range_max))
       break;
 
   return range.is_reversed() ? Range(range_max, range_min)
                              : Range(range_min, range_max);
 }
 
 }  // namespace gfx