Reintroduce password support to NativeTextfieldViews

ui/gfx/render_text_linux.cc

 // Copyright (c) 2011 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_linux.h"
 
 #include <pango/pangocairo.h>
 #include <algorithm>
 
 #include "base/i18n/break_iterator.h"
@@ skipping 216 matching lines @@
 
 void RenderTextLinux::EnsureLayout() {
   if (layout_ == NULL) {
     CanvasSkia canvas(display_rect().width(), display_rect().height(), false);
     skia::ScopedPlatformPaint scoped_platform_paint(canvas.sk_canvas());
     cairo_t* cr = scoped_platform_paint.GetPlatformSurface();
 
     layout_ = pango_cairo_create_layout(cr);
     SetupPangoLayout(
         layout_,
-        text(),
+        GetCensoredText(),
         default_style().font,
         display_rect().width(),
         base::i18n::GetFirstStrongCharacterDirection(text()),

[msw, 2011/12/03 00:22:40]

We should test this behavior with RTL passwords.

[benrg, 2011/12/08 21:40:55]

What this is intended to do is display the whole *** field RTL if the password
is (or starts out) RTL. Would always LTR be better? Matching the LTR/RTL ranges
of the unobscured text would be possible but rather difficult...

         CanvasSkia::DefaultCanvasTextAlignment());
 
     // No width set so that the x-axis position is relative to the start of the
     // text. ToViewPoint and ToTextPoint take care of the position conversion
     // between text space and view spaces.
     pango_layout_set_width(layout_, -1);
     // TODO(xji): If RenderText will be used for displaying purpose, such as
     // label, we will need to remove the single-line-mode setting.
     pango_layout_set_single_paragraph_mode(layout_, true);
     SetupPangoAttributes(layout_);
@@ skipping 210 matching lines @@
   if (!next_run)
     return RightEndSelectionModel();
 
   item = reinterpret_cast<PangoLayoutRun*>(next_run->data)->item;
   return (item->analysis.level % 2) ? LastSelectionModelInsideRun(item) :
                                       FirstSelectionModelInsideRun(item);
 }
 
 SelectionModel RenderTextLinux::LeftSelectionModelByWord(
     const SelectionModel& selection) {
-  base::i18n::BreakIterator iter(text(), base::i18n::BreakIterator::BREAK_WORD);
+  string16 txt = GetCensoredText();
+  base::i18n::BreakIterator iter(txt, base::i18n::BreakIterator::BREAK_WORD);
   bool success = iter.Init();
   DCHECK(success);
   if (!success)
     return selection;
 
   SelectionModel left_end = LeftEndSelectionModel();
   SelectionModel left(selection);
   while (!left.Equals(left_end)) {
     left = LeftSelectionModel(left);
     size_t caret = left.caret_pos();
     GSList* run = GetRunContainingPosition(caret);
     DCHECK(run);
     PangoItem* item = reinterpret_cast<PangoLayoutRun*>(run->data)->item;
     size_t cursor = left.selection_end();
     if (item->analysis.level % 2 == 0) {  // LTR run.
       if (iter.IsStartOfWord(cursor))
         return left;
     } else {  // RTL run.
       if (iter.IsEndOfWord(cursor))
         return left;
     }
   }
 
   return left_end;
 }
 
 SelectionModel RenderTextLinux::RightSelectionModelByWord(
     const SelectionModel& selection) {
-  base::i18n::BreakIterator iter(text(), base::i18n::BreakIterator::BREAK_WORD);
+  string16 txt = GetCensoredText();
+  base::i18n::BreakIterator iter(txt, base::i18n::BreakIterator::BREAK_WORD);
   bool success = iter.Init();
   DCHECK(success);
   if (!success)
     return selection;
 
   SelectionModel right_end = RightEndSelectionModel();
   SelectionModel right(selection);
   while (!right.Equals(right_end)) {
     right = RightSelectionModel(right);
     size_t caret = right.caret_pos();
@@ skipping 113 matching lines @@
   GSList* current = current_line_->runs;
   while (current && current->next) {
     current = current->next;
   }
   return current ? reinterpret_cast<PangoLayoutRun*>(current->data) : NULL;
 }
 
 size_t RenderTextLinux::Utf16IndexToUtf8Index(size_t index) const {
   int32_t utf8_index = 0;
   UErrorCode ec = U_ZERO_ERROR;
   u_strToUTF8(NULL, 0, &utf8_index, text().data(), index, &ec);

[msw, 2011/12/03 00:22:40]

Should this use GetCensoredText()?

[xji, 2011/12/06 01:24:04]

agree.

[benrg, 2011/12/08 21:40:55]

See out-of-line comments.

   // Even given a destination buffer as NULL and destination capacity as 0,
   // if the output length is equal to or greater than the capacity, then the
   // UErrorCode is set to U_STRING_NOT_TERMINATED_WARNING or
   // U_BUFFER_OVERFLOW_ERROR respectively.
   // Please refer to
   // http://userguide.icu-project.org/strings#TOC-Using-C-Strings:-NUL-Terminated-vs
   // for detail (search for "Note that" below "Preflighting").
   DCHECK(ec == U_BUFFER_OVERFLOW_ERROR ||
          ec == U_STRING_NOT_TERMINATED_WARNING);
   return utf8_index;
@@ skipping 38 matching lines @@
 }
 
 void RenderTextLinux::GetSelectionBounds(std::vector<Rect>* bounds) {
   if (selection_visual_bounds_.empty())
     CalculateSubstringBounds(GetSelectionStart(), GetCursorPosition(),
                              &selection_visual_bounds_);
   *bounds = selection_visual_bounds_;
 }
 
 }  // namespace gfx