Reintroduce password support to NativeTextfieldViews

ui/gfx/render_text_linux.h

 // 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.
 
 #ifndef UI_GFX_RENDER_TEXT_LINUX_H_
 #define UI_GFX_RENDER_TEXT_LINUX_H_
 #pragma once
 
 #include <pango/pango.h>
 #include <vector>
@@ skipping 33 matching lines @@
   virtual void DrawVisualText(Canvas* canvas) OVERRIDE;
 
  private:
   virtual size_t IndexOfAdjacentGrapheme(
       size_t index,
       LogicalCursorDirection direction) OVERRIDE;
 
   // Returns the run that contains |position|. Return NULL if not found.
   GSList* GetRunContainingPosition(size_t position) const;
 
-  // Given |utf8_index_of_current_grapheme|, returns the UTF-8 index of the
-  // |next| or previous grapheme in logical order. Returns 0 if there is no
-  // previous grapheme, or the |text_| length if there is no next grapheme.
-  size_t Utf8IndexOfAdjacentGrapheme(size_t utf8_index_of_current_grapheme,
-                                     LogicalCursorDirection direction) const;
+  // Given |layout_index_of_current_grapheme|, returns the layout (UTF-8) index
+  // of the |next| or previous grapheme in logical order. Returns 0 if there is
+  // no previous grapheme, or the |text_| length if there is no next grapheme.
+  size_t LayoutIndexOfAdjacentGrapheme(size_t layout_index_of_current_grapheme,
+                                       LogicalCursorDirection direction) const;
 
   // Given a |run|, returns the SelectionModel that contains the logical first
   // or last caret position inside (not at a boundary of) the run.
   // The returned value represents a cursor/caret position without a selection.
   SelectionModel FirstSelectionModelInsideRun(const PangoItem* run) const;
   SelectionModel LastSelectionModelInsideRun(const PangoItem* run) const;
 
   // Unref |layout_| and |pango_line_|. Set them to NULL.
   void ResetLayout();
 
   // Setup pango attribute: foreground, background, font, strike.
   void SetupPangoAttributes(PangoLayout* layout);
 
   // Append one pango attribute |pango_attr| into pango attribute list |attrs|.
   void AppendPangoAttribute(size_t start,
                             size_t end,
                             PangoAttribute* pango_attr,
                             PangoAttrList* attrs);
 
-  size_t Utf16IndexToUtf8Index(size_t index) const;
-  size_t Utf8IndexToUtf16Index(size_t index) const;
+  // Convert between indices into text() and indices into |layout_text_|.
+  size_t TextIndexToLayoutIndex(size_t index) const;
+  size_t LayoutIndexToTextIndex(size_t index) const;
 
   // Calculate the visual bounds containing the logical substring within |from|
   // to |to|.
   std::vector<Rect> CalculateSubstringBounds(size_t from, size_t to);
 
   // Get the visual bounds of the logical selection.
   std::vector<Rect> GetSelectionBounds();
 
   // Pango Layout.
   PangoLayout* layout_;
@@ skipping 12 matching lines @@
   const char* layout_text_;
   // The text length.
   size_t layout_text_len_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderTextLinux);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_RENDER_TEXT_LINUX_H_