Separate selection highlight from pango layout

ui/gfx/render_text_linux.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_LINUX_H_
 #define UI_GFX_RENDER_TEXT_LINUX_H_
 #pragma once
 
 #include <pango/pango.h>
 

[msw, 2011/11/28 20:01:17]

I don't think you need this blank line, both are system headers.

[xji, 2011/11/29 01:37:02]

Done.

+#include <vector>
+
 #include "ui/gfx/render_text.h"
 
 namespace gfx {
 
 // RenderTextLinux is the Linux implementation of RenderText using Pango.
 class RenderTextLinux : public RenderText {
  public:
   RenderTextLinux();
   virtual ~RenderTextLinux();
 
   // Overridden from RenderText:
   virtual base::i18n::TextDirection GetTextDirection() OVERRIDE;
   virtual int GetStringWidth() OVERRIDE;
   virtual void Draw(Canvas* canvas) OVERRIDE;
   virtual SelectionModel FindCursorPosition(const Point& point) OVERRIDE;
   virtual Rect GetCursorBounds(const SelectionModel& position,
                                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 SetSelectionModel(
+      const SelectionModel& selection_model) OVERRIDE;
   virtual bool IsCursorablePosition(size_t position) OVERRIDE;
   virtual void UpdateLayout() OVERRIDE;
+  virtual void DrawVisualText(Canvas* canvas) OVERRIDE;
 
  private:
   virtual size_t IndexOfAdjacentGrapheme(size_t index, bool next) 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 UTF8 or UTF16 index of
   // next grapheme in the text if |next| is true, otherwise, returns the index
   // of previous grapheme. Returns 0 if there is no previous grapheme, and
@@ skipping 40 matching lines @@
   // The complexity is O(n) since it is a single-linked list.
   PangoLayoutRun* GetPreviousRun(PangoLayoutRun* run) const;
 
   // Returns the last run in |current_line_|.
   // The complexity is O(n) since it is a single-linked list.
   PangoLayoutRun* GetLastRun() const;
 
   size_t Utf16IndexToUtf8Index(size_t index) const;
   size_t Utf8IndexToUtf16Index(size_t index) const;
 
+  // Save the visual bounds containing the logical substring within |from| to
+  // |to| into |bounds|.
+  void GetSubstringBounds(size_t from, size_t to, std::vector<Rect>* bounds);

[msw, 2011/11/28 20:01:17]

Our style guide discourages overloading function names.
Can you rename this or merge it with the other GetSubstringBounds?

[xji, 2011/11/29 01:37:02]

changed the name to CalculateSubstringBounds.

+
   // Pango Layout.
   PangoLayout* layout_;
   // A single line layout resulting from laying out via |layout_|.
   PangoLayoutLine* current_line_;
 
   // Information about character attributes.
   PangoLogAttr* log_attrs_;
   // Number of attributes in |log_attrs_|.
   int num_log_attrs_;
 
+  // Vector of the visual bounds containing the logical substring of selection.
+  std::vector<Rect> selection_visual_bounds_;
+
   // The text in the |layout_|.
   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_