Separate selection highlight from pango layout

ui/gfx/render_text.cc

 // 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.
 
 #include "ui/gfx/render_text.h"
 
 #include <algorithm>
 
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
@@ skipping 105 matching lines @@
     style_ranges_.back().range.set_end(text_.length());
   }
 #ifndef NDEBUG
   CheckStyleRanges(style_ranges_, text_.length());
 #endif
   cached_bounds_and_offset_valid_ = false;
 
   // Reset selection model. SetText should always followed by SetSelectionModel
   // or SetCursorPosition in upper layer.
   SetSelectionModel(SelectionModel(0, 0, SelectionModel::LEADING));
+
+  UpdateLayout();
 }
 
 void RenderText::ToggleInsertMode() {
   insert_mode_ = !insert_mode_;
   cached_bounds_and_offset_valid_ = false;
 }
 
 void RenderText::SetDisplayRect(const Rect& r) {
   display_rect_ = r;
   cached_bounds_and_offset_valid_ = false;
@@ skipping 201 matching lines @@
   if (base::i18n::IsRTL())
     return base::i18n::RIGHT_TO_LEFT;
   return base::i18n::LEFT_TO_RIGHT;
 }
 
 int RenderText::GetStringWidth() {
   return default_style_.font.GetStringWidth(text());
 }
 
 void RenderText::Draw(Canvas* canvas) {
-  // Clip the canvas to the text display area.
-  canvas->ClipRect(display_rect_);
-
-  // Draw the selection.
-  std::vector<Rect> selection(GetSubstringBounds(GetSelectionStart(),
-                                                 GetCursorPosition()));
-  SkColor selection_color =
-      focused() ? kFocusedSelectionColor : kUnfocusedSelectionColor;
-  for (std::vector<Rect>::const_iterator i = selection.begin();
-       i < selection.end(); ++i) {
-    Rect r(*i);
-    canvas->FillRect(selection_color, r);
-  }
-
-  // Create a temporary copy of the style ranges for composition and selection.
-  StyleRanges style_ranges(style_ranges_);
-  ApplyCompositionAndSelectionStyles(&style_ranges);
-
-  // Draw the text.
-  Rect bounds(display_rect_);
-  bounds.Offset(GetUpdatedDisplayOffset());
-  for (StyleRanges::const_iterator i = style_ranges.begin();
-       i < style_ranges.end(); ++i) {
-    const Font& font = !i->underline ? i->font :
-        i->font.DeriveFont(0, i->font.GetStyle() | Font::UNDERLINED);
-    string16 text = text_.substr(i->range.start(), i->range.length());
-    bounds.set_width(font.GetStringWidth(text));
-    canvas->DrawStringInt(text, font, i->foreground, bounds);
-
-    // Draw the strikethrough.
-    if (i->strike) {
-      SkPaint paint;
-      paint.setAntiAlias(true);
-      paint.setStyle(SkPaint::kFill_Style);
-      paint.setColor(i->foreground);
-      paint.setStrokeWidth(kStrikeWidth);
-      canvas->GetSkCanvas()->drawLine(SkIntToScalar(bounds.x()),
-                                      SkIntToScalar(bounds.bottom()),
-                                      SkIntToScalar(bounds.right()),
-                                      SkIntToScalar(bounds.y()),
-                                      paint);
-    }
-
-    bounds.set_x(bounds.x() + bounds.width());
-  }
-
-  // Paint cursor. Replace cursor is drawn as rectangle for now.
-  Rect cursor(GetUpdatedCursorBounds());
-  if (cursor_visible() && focused())
-    canvas->DrawRectInt(kCursorColor, cursor.x(), cursor.y(),
-                        cursor.width(), cursor.height());
+  DrawSelection(canvas);
+  DrawVisualText(canvas);
+  DrawCursor(canvas);
 }
 
 SelectionModel RenderText::FindCursorPosition(const Point& point) {
   const Font& font = default_style_.font;
   int left = 0;
   int left_pos = 0;
   int right = font.GetStringWidth(text());
   int right_pos = text().length();
 
   int x = point.x() - (display_rect_.x() + GetUpdatedDisplayOffset().x());
@@ skipping 134 matching lines @@
 }
 
 SelectionModel RenderText::RightEndSelectionModel() {
   size_t cursor = text().length();
   size_t caret_pos = GetIndexOfPreviousGrapheme(cursor);
   SelectionModel::CaretPlacement placement = (caret_pos == cursor) ?
       SelectionModel::LEADING : SelectionModel::TRAILING;
   return SelectionModel(cursor, caret_pos, placement);
 }
 
-size_t RenderText::GetIndexOfPreviousGrapheme(size_t position) {
-  return IndexOfAdjacentGrapheme(position, false);
-}
-
 std::vector<Rect> RenderText::GetSubstringBounds(size_t from, size_t to) {
   size_t start = std::min(from, to);
   size_t end = std::max(from, to);
   const Font& font = default_style_.font;
   int start_x = font.GetStringWidth(text().substr(0, start));
   int end_x = font.GetStringWidth(text().substr(0, end));
   Rect rect(start_x, 0, end_x - start_x, font.GetHeight());
   rect.Offset(display_rect_.origin());
   rect.Offset(GetUpdatedDisplayOffset());
   // Center the rect vertically in |display_rect_|.
   rect.Offset(Point(0, (display_rect_.height() - rect.height()) / 2));
   return std::vector<Rect>(1, rect);
 }
 
+void RenderText::SetSelectionModel(const SelectionModel& selection_model) {
+  DCHECK_LE(selection_model.selection_start(), text().length());
+  selection_model_.set_selection_start(selection_model.selection_start());
+  DCHECK_LE(selection_model.selection_end(), text().length());
+  selection_model_.set_selection_end(selection_model.selection_end());
+  DCHECK_LT(selection_model.caret_pos(),
+            std::max(text().length(), static_cast<size_t>(1)));
+  selection_model_.set_caret_pos(selection_model.caret_pos());
+  selection_model_.set_caret_placement(selection_model.caret_placement());
+
+  cached_bounds_and_offset_valid_ = false;
+}
+
+size_t RenderText::GetIndexOfPreviousGrapheme(size_t position) {
+  return IndexOfAdjacentGrapheme(position, false);
+}
+
 void RenderText::ApplyCompositionAndSelectionStyles(
     StyleRanges* style_ranges) const {
   // TODO(msw): This pattern ought to be reconsidered; what about composition
   //            and selection overlaps, retain existing local style features?
   // Apply a composition style override to a copy of the style ranges.
   if (composition_range_.IsValid() && !composition_range_.is_empty()) {
     StyleRange composition_style(default_style_);
     composition_style.underline = true;
     composition_style.range.set_start(composition_range_.start());
     composition_style.range.set_end(composition_range_.end());
@@ skipping 18 matching lines @@
 }
 
 Point RenderText::ToViewPoint(const Point& point) {
   Point p(point.Add(display_rect().origin()));
   p = p.Add(GetUpdatedDisplayOffset());
   if (base::i18n::IsRTL())
     p.Offset(display_rect().width() - GetStringWidth() - 1, 0);
   return p;
 }
 
-void RenderText::SetSelectionModel(const SelectionModel& selection_model) {
-  DCHECK_LE(selection_model.selection_start(), text().length());
-  selection_model_.set_selection_start(selection_model.selection_start());
-  DCHECK_LE(selection_model.selection_end(), text().length());
-  selection_model_.set_selection_end(selection_model.selection_end());
-  DCHECK_LT(selection_model.caret_pos(),
-            std::max(text().length(), static_cast<size_t>(1)));
-  selection_model_.set_caret_pos(selection_model.caret_pos());
-  selection_model_.set_caret_placement(selection_model.caret_placement());
-
-  cached_bounds_and_offset_valid_ = false;
-  UpdateLayout();
-}
-
 void RenderText::MoveCursorTo(size_t position, bool select) {
   size_t cursor = std::min(position, text().length());
   size_t caret_pos = GetIndexOfPreviousGrapheme(cursor);
   SelectionModel::CaretPlacement placement = (caret_pos == cursor) ?
       SelectionModel::LEADING : SelectionModel::TRAILING;
   size_t selection_start = select ? GetSelectionStart() : cursor;
   if (IsCursorablePosition(cursor)) {
     SelectionModel sel(selection_start, cursor, caret_pos, placement);
     SetSelectionModel(sel);
   }
@@ skipping 25 matching lines @@
     // TODO(xji): have similar problem as above when overflow character is a
     // LTR character.
     //
     // Pan to show the cursor when it overflows to the left.
     delta_offset = display_rect_.x() - cursor_bounds_.x();
   }
   display_offset_.Offset(delta_offset, 0);
   cursor_bounds_.Offset(delta_offset, 0);
 }
 
+void RenderText::DrawSelection(Canvas* canvas) {
+  std::vector<Rect> sel(
+      GetSubstringBounds(GetSelectionStart(), GetCursorPosition()));
+  SkColor color = focused() ? kFocusedSelectionColor : kUnfocusedSelectionColor;
+  for (std::vector<Rect>::const_iterator i = sel.begin(); i < sel.end(); ++i)
+    canvas->FillRect(color, *i);
+}
+
+void RenderText::DrawCursor(Canvas* canvas) {
+  // Paint cursor. Replace cursor is drawn as rectangle for now.
+  // TODO(msw): Draw a better cursor with a better indication of association.
+  if (cursor_visible() && focused()) {
+    Rect r(GetUpdatedCursorBounds());
+    canvas->DrawRectInt(kCursorColor, r.x(), r.y(), r.width(), r.height());
+  }
+}
+
 }  // namespace gfx