Reintroduce password support to NativeTextfieldViews

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 <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
+#include "base/utf_offset_string_conversions.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/native_theme.h"
-#include "unicode/uchar.h"
 
 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 char16 kPasswordReplacementChar = '*';
+
 // Color settings for text, backgrounds and cursor.
 // These are tentative, and should be derived from theme, system
 // settings and current settings.
 // TODO(oshima): Change this to match the standard chrome
 // before dogfooding textfield views.
 const SkColor kCursorColor = SK_ColorBLACK;
 
 #ifndef NDEBUG
 // Check StyleRanges invariant conditions: sorted and non-overlapping ranges.
 void CheckStyleRanges(const gfx::StyleRanges& style_ranges, size_t length) {
@@ skipping 327 matching lines @@
 
 void RenderText::SetCursorEnabled(bool cursor_enabled) {
   cursor_enabled_ = cursor_enabled;
   cached_bounds_and_offset_valid_ = false;
 }
 
 const Font& RenderText::GetFont() const {
   return font_list_.GetFonts()[0];
 }
 
+string16 RenderText::GetDisplayText() const {
+  if (!obscured_) {
+    return text_;
+  } else {

[msw, 2012/02/22 00:33:26]

Drop the braces and make the else block just follow the if/return.

[benrg, 2012/02/24 19:07:44]

Done.

+    size_t obscured_text_length =
+        static_cast<size_t>(Utf16IndexToOffset(text_, 0, text_.length()));

[msw, 2012/02/22 00:33:26]

Does this work on Win? If not, comment here or block this path.

[benrg, 2012/02/24 19:07:44]

This method is currently not called on Windows (but would work if it was).

+    return string16(obscured_text_length, kPasswordReplacementChar);
+  }
+}
+
 void RenderText::ToggleInsertMode() {
   insert_mode_ = !insert_mode_;
   cached_bounds_and_offset_valid_ = false;
 }
 
+void RenderText::SetObscured(bool obscured) {
+  obscured_ = obscured;
+  cached_bounds_and_offset_valid_ = false;
+  UpdateLayout();

[xji, 2012/02/18 01:28:47]

guard all 3 statements under "if (obscured != obscured_)"

[benrg, 2012/02/24 19:07:44]

Done.

+}
+
 void RenderText::SetDisplayRect(const Rect& r) {
   display_rect_ = r;
   cached_bounds_and_offset_valid_ = false;
   UpdateLayout();
 }
 
 size_t RenderText::GetCursorPosition() const {
   return selection_model_.selection_end();
 }
 
@@ skipping 103 matching lines @@
   SetSelectionModel(sel);
 }
 
 void RenderText::SelectAll() {
   SelectionModel sel = EdgeSelectionModel(CURSOR_RIGHT);
   sel.set_selection_start(EdgeSelectionModel(CURSOR_LEFT).selection_start());
   SetSelectionModel(sel);
 }
 
 void RenderText::SelectWord() {
+  if (obscured_) {
+    SelectAll();
+    return;
+  }
+
   size_t cursor_position = GetCursorPosition();
 
   base::i18n::BreakIterator iter(text(), base::i18n::BreakIterator::BREAK_WORD);
   bool success = iter.Init();
   DCHECK(success);
   if (!success)
     return;
 
   size_t selection_start = cursor_position;
   for (; selection_start != 0; --selection_start) {
@@ skipping 98 matching lines @@
   return selection_model_;
 }
 
 RenderText::RenderText()
     : horizontal_alignment_(base::i18n::IsRTL() ? ALIGN_RIGHT : ALIGN_LEFT),
       cursor_enabled_(true),
       cursor_visible_(false),
       insert_mode_(true),
       focused_(false),
       composition_range_(ui::Range::InvalidRange()),
+      obscured_(false),
       fade_head_(false),
       fade_tail_(false),
       cached_bounds_and_offset_valid_(false) {
 }
 
 const Point& RenderText::GetUpdatedDisplayOffset() {
   UpdateCachedBoundsAndOffset();
   return display_offset_;
 }
 
@@ skipping 227 matching lines @@
   if (cursor_enabled() && cursor_visible() && focused()) {
     const Rect& bounds = GetUpdatedCursorBounds();
     if (bounds.width() != 0)
       canvas->FillRect(bounds, kCursorColor);
     else
       canvas->DrawRect(bounds, kCursorColor);
   }
 }
 
 }  // namespace gfx