Reintroduce password support to NativeTextfieldViews

ui/gfx/render_text.h

 // 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.
 
 #ifndef UI_GFX_RENDER_TEXT_H_
 #define UI_GFX_RENDER_TEXT_H_
 #pragma once
 
 #include <algorithm>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/i18n/rtl.h"
 #include "base/string16.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/range/range.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/selection_model.h"
 
 namespace gfx {
 
-// 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 kSelectedTextColor = SK_ColorWHITE;
-const SkColor kFocusedSelectionColor = SkColorSetRGB(30, 144, 255);
-const SkColor kUnfocusedSelectionColor = SK_ColorLTGRAY;
-const SkColor kCursorColor = SK_ColorBLACK;
-
 class Canvas;
 class RenderTextTest;
 
 // A visual style applicable to a range of text.
 struct UI_EXPORT StyleRange {
   StyleRange();
 
   Font font;
   SkColor foreground;
   bool strike;
@@ skipping 22 matching lines @@
 class UI_EXPORT RenderText {
  public:
   virtual ~RenderText();
 
   // Creates a platform-specific RenderText instance.
   static RenderText* CreateRenderText();
 
   const string16& text() const { return text_; }
   void SetText(const string16& text);
 
+  // Like text() except that it returns asterisks or bullets if this is an
+  // obscured field.
+  string16 GetObscuredText() const;
+
   const SelectionModel& selection_model() const { return selection_model_; }
 
   bool cursor_visible() const { return cursor_visible_; }
   void set_cursor_visible(bool visible) { cursor_visible_ = visible; }
 
   bool insert_mode() const { return insert_mode_; }
   void ToggleInsertMode();
 
   bool focused() const { return focused_; }
   void set_focused(bool focused) { focused_ = focused; }
 
   const StyleRange& default_style() const { return default_style_; }
   void set_default_style(StyleRange style) { default_style_ = style; }
 
+  // In an obscured (password) field, all text is drawn as asterisks or bullets.
+  bool is_obscured() const { return obscured_; }
+  void SetIsObscured(bool obscured);

[oshima, 2011/12/06 23:57:18]

SetObscured 

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

Done.

+
   const Rect& display_rect() const { return display_rect_; }
   void SetDisplayRect(const Rect& r);
 
   // This cursor position corresponds to SelectionModel::selection_end. In
   // addition to representing the selection end, it's also where logical text
   // edits take place, and doesn't necessarily correspond to
   // SelectionModel::caret_pos.
   size_t GetCursorPosition() const;
   void SetCursorPosition(size_t position);
 
@@ skipping 49 matching lines @@
 
   // Apply |style_range| to the internal style model.
   void ApplyStyleRange(StyleRange style_range);
 
   // Apply |default_style_| over the entire text range.
   void ApplyDefaultStyle();
 
   virtual base::i18n::TextDirection GetTextDirection();
 
   // Get the width of the entire string.
-  virtual int GetStringWidth();
+  virtual int GetStringWidth() = 0;
 
   virtual void Draw(Canvas* canvas);
 
   // Gets the SelectionModel from a visual point in local coordinates.
-  virtual SelectionModel FindCursorPosition(const Point& point);
+  virtual SelectionModel FindCursorPosition(const Point& point) = 0;
 
   // Get the visual bounds of a cursor at |selection|. These bounds typically
   // represent a vertical line, but if |insert_mode| is true they contain the
   // bounds of the associated glyph. These bounds are in local coordinates, but
   // may be outside the visible region if the text is longer than the textfield.
   // Subsequent text, cursor, or bounds changes may invalidate returned values.
   virtual Rect GetCursorBounds(const SelectionModel& selection,
                                bool insert_mode) = 0;
 
   // Compute the current cursor bounds, panning the text to show the cursor in
@@ skipping 114 matching lines @@
   bool focused_;
 
   // Composition text range.
   ui::Range composition_range_;
 
   // List of style ranges. Elements in the list never overlap each other.
   StyleRanges style_ranges_;
   // The default text style.
   StyleRange default_style_;
 
+  // True if this is a password field.

[oshima, 2011/12/06 23:57:18]

update the comment

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

Done.

+  bool obscured_;
+
   // The local display area for rendering the text.
   Rect display_rect_;
   // The offset for the text to be drawn, relative to the display area.
   // Get this point with GetUpdatedDisplayOffset (or risk using a stale value).
   Point display_offset_;
 
   // The cached bounds and offset are invalidated by changes to the cursor,
   // selection, font, and other operations that adjust the visible text bounds.
   bool cached_bounds_and_offset_valid_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderText);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_RENDER_TEXT_H_