Fix RenderText cached bounds and offset logic; update clients.

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>
@@ skipping 153 matching lines @@
   bool insert_mode() const { return insert_mode_; }
   void toggle_insert_mode() { insert_mode_ = !insert_mode_; }
 
   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; }
 
   const Rect& display_rect() const { return display_rect_; }
-  virtual void set_display_rect(const Rect& r);
-
-  const Point& display_offset() const { return display_offset_; }
+  virtual 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(const size_t position);
 
   void SetCaretPlacement(SelectionModel::CaretPlacement placement) {
       selection_model_.set_caret_placement(placement);
@@ skipping 48 matching lines @@
   // Get the width of the entire string.
   virtual int GetStringWidth();
 
   virtual void Draw(Canvas* canvas);
 
   // Gets the SelectionModel from a visual point in local coordinates.
   virtual SelectionModel FindCursorPosition(const Point& point);
 
   // Get the visual bounds containing the logical substring within |from| to
   // |to|. These bounds could be visually discontinuous if the logical
-  // selection range is split by an odd number of LTR/RTL level change.
+  // selection range is split by an odd number of LTR/RTL level change. These
+  // bounds are offset by the text's display rect and display offset.
   virtual std::vector<Rect> GetSubstringBounds(
-      size_t from, size_t to) const;
+      size_t from, size_t to);
 
   // Get the visual bounds describing the cursor at |selection|. These bounds
   // typically represent a vertical line, but if |insert_mode| is true they
-  // contain the bounds of the associated glyph.
+  // contain the bounds of the associated glyph. These bounds are offset by the
+  // text's display rect and display offset.
   virtual Rect GetCursorBounds(const SelectionModel& selection,
                                bool insert_mode);
 
-  // Compute cursor_bounds_ and update display_offset_ when necessary. Cache
-  // the values for later use and return cursor_bounds_.
-  const Rect& CursorBounds();
+  // Get the current cursor bounds, updating the cached rect if necessary. These
+  // bounds are offset by the text's display rect and display offset.
+  const Rect& GetUpdatedCursorBounds();
 
  protected:
   RenderText();
 
-  void set_cursor_bounds_valid(bool valid) { cursor_bounds_valid_ = valid; }
+  const Point& GetUpdatedDisplayOffset();
+
+  void set_cached_bounds_and_offset_valid(bool valid) {
+      cached_bounds_and_offset_valid_ = valid;
+  }
 
   const StyleRanges& style_ranges() const { return style_ranges_; }
 
   // Get the selection model that visually neighbors |position| by |break_type|.
   // The returned value represents a cursor/caret position without a selection.
   virtual SelectionModel GetLeftSelectionModel(const SelectionModel& current,
                                                BreakType break_type);
   virtual SelectionModel GetRightSelectionModel(const SelectionModel& current,
                                                 BreakType break_type);
 
@@ skipping 10 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, DefaultStyle);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, CustomDefaultStyle);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ApplyStyleRange);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, StyleRangesAdjust);
 
   // Clear out |style_ranges_|.
   void ClearStyleRanges();
 
   bool IsPositionAtWordSelectionBoundary(size_t pos);
 
-  void UpdateCursorBoundsAndDisplayOffset();
+  // Update the cached bounds and display offset to ensure that the current
+  // cursor is within the visible display area.
+  void UpdateCachedBoundsAndOffset();
 
   // Logical UTF-16 string data to be drawn.
   string16 text_;
 
   // Logical selection range and visual cursor position.
   SelectionModel selection_model_;
 
-  // The cached cursor bounds.
+  // The cached cursor bounds; get these bounds with GetUpdatedCursorBounds.
   Rect cursor_bounds_;
-  // cursor_bounds_ is computed when needed and cached afterwards. And it is
-  // invalidated in operations such as SetCursorPosition, SetSelection, Font
-  // related style change, and other operations that trigger re-layout.
-  bool cursor_bounds_valid_;
 
   // The cursor visibility and insert mode.
   bool cursor_visible_;
   bool insert_mode_;
 
   // The focus state of the text.
   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_;
 
   // 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 operations such as
+  // SetCursorPosition, SetSelection, Font related style change, 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_