Separate selection highlight from pango layout

ui/gfx/render_text_win.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_WIN_H_
 #define UI_GFX_RENDER_TEXT_WIN_H_
 #pragma once
 
 #include <usp10.h>
 
@@ skipping 42 matching lines @@
 }  // namespace internal
 
 // RenderTextWin is the Windows implementation of RenderText using Uniscribe.
 class RenderTextWin : public RenderText {
  public:
   RenderTextWin();
   virtual ~RenderTextWin();
 
   // Overridden from RenderText:
   virtual int GetStringWidth() OVERRIDE;
-  virtual void Draw(Canvas* canvas) OVERRIDE;
   virtual SelectionModel FindCursorPosition(const Point& point) OVERRIDE;
   virtual Rect GetCursorBounds(const SelectionModel& selection,
                                bool insert_mode) OVERRIDE;
 
  protected:
   // Overridden from RenderText:
   virtual SelectionModel GetLeftSelectionModel(const SelectionModel& current,
                                                BreakType break_type) OVERRIDE;
   virtual SelectionModel GetRightSelectionModel(const SelectionModel& current,
                                                 BreakType break_type) OVERRIDE;
   virtual SelectionModel LeftEndSelectionModel() OVERRIDE;
   virtual SelectionModel RightEndSelectionModel() OVERRIDE;
-  virtual std::vector<Rect> GetSubstringBounds(size_t from, size_t to) OVERRIDE;
+  virtual void GetSubstringBounds(size_t from,
+                                  size_t to,
+                                  std::vector<Rect>* bounds) OVERRIDE;
   virtual bool IsCursorablePosition(size_t position) OVERRIDE;
   virtual void UpdateLayout() OVERRIDE;
+  virtual void EnsureLayout() OVERRIDE;
+  virtual void DrawVisualText(Canvas* canvas) OVERRIDE;
 
  private:
   virtual size_t IndexOfAdjacentGrapheme(size_t index, bool next) OVERRIDE;
 
-  void EnsureLayout();
   void ItemizeLogicalText();
   void LayoutVisualText();
 
   // Return the run index that contains the argument; or the length of the
   // |runs_| vector if argument exceeds the text length or width.
   size_t GetRunContainingPosition(size_t position) const;
   size_t GetRunContainingPoint(const Point& point) 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(internal::TextRun* run);
   SelectionModel LastSelectionModelInsideRun(internal::TextRun* run);
 
   // Get the selection model visually left/right of |selection| by one grapheme.
   // The returned value represents a cursor/caret position without a selection.
   SelectionModel LeftSelectionModel(const SelectionModel& selection);
   SelectionModel RightSelectionModel(const SelectionModel& selection);
 
-  // Draw the text, cursor, and selection.
-  void DrawSelection(Canvas* canvas);
-  void DrawVisualText(Canvas* canvas);
-  void DrawCursor(Canvas* canvas);
-
   // National Language Support native digit and digit substitution settings.
   SCRIPT_DIGITSUBSTITUTE digit_substitute_;
 
   SCRIPT_CONTROL script_control_;
   SCRIPT_STATE script_state_;
 
   std::vector<internal::TextRun*> runs_;
   int string_width_;
 
   scoped_array<int> visual_to_logical_;
   scoped_array<int> logical_to_visual_;
 
   bool needs_layout_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderTextWin);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_RENDER_TEXT_WIN_H_