Separate selection highlight from pango layout

ui/gfx/render_text_win.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_win.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/logging.h"
@@ skipping 91 matching lines @@
 
 RenderTextWin::~RenderTextWin() {
   ScriptFreeCache(&script_cache_);
   STLDeleteContainerPointers(runs_.begin(), runs_.end());
 }
 
 int RenderTextWin::GetStringWidth() {
   return string_width_;
 }
 
-void RenderTextWin::Draw(Canvas* canvas) {
-  DrawSelection(canvas);
-  DrawVisualText(canvas);
-  DrawCursor(canvas);
-}
-
 SelectionModel RenderTextWin::FindCursorPosition(const Point& point) {
   if (text().empty())
     return SelectionModel();
 
   // Find the run that contains the point and adjust the argument location.
   Point p(ToTextPoint(point));
   size_t run_index = GetRunContainingPoint(p);
   if (run_index == runs_.size())
     return (p.x() < 0) ? LeftEndSelectionModel() : RightEndSelectionModel();
   internal::TextRun* run = runs_[run_index];
@@ skipping 186 matching lines @@
 }
 
 void RenderTextWin::UpdateLayout() {
   // TODO(msw): Skip complex processing if ScriptIsComplex returns false.
   ItemizeLogicalText();
   HDC hdc = CreateCompatibleDC(NULL);
   LayoutVisualText(hdc);
   DeleteDC(hdc);
 }
 
+void RenderTextWin::DrawVisualText(Canvas* canvas) {
+  if (text().empty())
+    return;
+
+  SkCanvas* canvas_skia = canvas->GetSkCanvas();
+
+  Point offset(ToViewPoint(Point()));
+  // TODO(msw): Establish a vertical baseline for strings of mixed font heights.
+  size_t height = default_style().font.GetHeight();
+
+  SkScalar x = SkIntToScalar(offset.x());
+  SkScalar y = SkIntToScalar(offset.y());
+  // Center the text vertically in the display area.
+  y += (display_rect().height() - height) / 2;
+  // Offset by the font size to account for Skia expecting y to be the bottom.
+  y += default_style().font.GetFontSize();
+
+  SkPaint paint;
+  paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
+  paint.setStyle(SkPaint::kFill_Style);
+  paint.setAntiAlias(true);
+  paint.setSubpixelText(true);
+  paint.setLCDRenderText(true);
+
+  std::vector<SkPoint> pos;
+  for (size_t i = 0; i < runs_.size(); ++i) {
+    // Get the run specified by the visual-to-logical map.
+    internal::TextRun* run = runs_[visual_to_logical_[i]];
+
+    // TODO(msw): Font default/fallback and style integration.
+    SkTypeface::Style style = SkTypeface::kNormal;
+    SkTypeface* typeface =
+        SkTypeface::CreateFromName(run->font.GetFontName().c_str(), style);
+    if (typeface) {
+      paint.setTypeface(typeface);
+      // |paint| adds its own ref. Release the ref from CreateFromName.
+      typeface->unref();
+    }
+    paint.setTextSize(run->font.GetFontSize());
+    paint.setColor(run->foreground);
+
+    SkScalar run_x = x;
+
+    // Based on WebCore::skiaDrawText.
+    pos.resize(run->glyph_count);
+    for (int glyph = 0; glyph < run->glyph_count; glyph++) {
+        pos[glyph].set(x + run->offsets[glyph].du,
+                       y + run->offsets[glyph].dv);
+        x += SkIntToScalar(run->advance_widths[glyph]);
+    }
+
+    size_t byte_length = run->glyph_count * sizeof(WORD);
+    canvas_skia->drawPosText(run->glyphs.get(), byte_length, &pos[0], paint);
+
+    if (run->strike || run->underline)
+      DrawTextRunDecorations(canvas_skia, paint, *run, run_x, y);
+  }
+}
+
 size_t RenderTextWin::IndexOfAdjacentGrapheme(size_t index, bool next) {
   size_t run_index = GetRunContainingPosition(index);
   internal::TextRun* run = run_index < runs_.size() ? runs_[run_index] : NULL;
   int start = run ? run->range.start() : 0;
   int length = run ? run->range.length() : text().length();
   int ch = index - start;
   WORD cluster = run ? run->logical_clusters[ch] : 0;
 
   if (!next) {
     do {
@@ skipping 251 matching lines @@
 
   // The character is at the end of its run; go to the next visual run.
   size_t visual_index = logical_to_visual_[run_index];
   if (visual_index == runs_.size() - 1)
     return RightEndSelectionModel();
   internal::TextRun* next = runs_[visual_to_logical_[visual_index + 1]];
   return next->script_analysis.fRTL ? LastSelectionModelInsideRun(next) :
                                       FirstSelectionModelInsideRun(next);
 }
 
-void RenderTextWin::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 RenderTextWin::DrawVisualText(Canvas* canvas) {
-  if (text().empty())
-    return;
-
-  SkCanvas* canvas_skia = canvas->GetSkCanvas();
-
-  Point offset(ToViewPoint(Point()));
-  // TODO(msw): Establish a vertical baseline for strings of mixed font heights.
-  size_t height = default_style().font.GetHeight();
-
-  SkScalar x = SkIntToScalar(offset.x());
-  SkScalar y = SkIntToScalar(offset.y());
-  // Center the text vertically in the display area.
-  y += (display_rect().height() - height) / 2;
-  // Offset by the font size to account for Skia expecting y to be the bottom.
-  y += default_style().font.GetFontSize();
-
-  SkPaint paint;
-  paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
-  paint.setStyle(SkPaint::kFill_Style);
-  paint.setAntiAlias(true);
-  paint.setSubpixelText(true);
-  paint.setLCDRenderText(true);
-
-  std::vector<SkPoint> pos;
-  for (size_t i = 0; i < runs_.size(); ++i) {
-    // Get the run specified by the visual-to-logical map.
-    internal::TextRun* run = runs_[visual_to_logical_[i]];
-
-    // TODO(msw): Font default/fallback and style integration.
-    SkTypeface::Style style = SkTypeface::kNormal;
-    SkTypeface* typeface =
-        SkTypeface::CreateFromName(run->font.GetFontName().c_str(), style);
-    if (typeface) {
-      paint.setTypeface(typeface);
-      // |paint| adds its own ref. Release the ref from CreateFromName.
-      typeface->unref();
-    }
-    paint.setTextSize(run->font.GetFontSize());
-    paint.setColor(run->foreground);
-
-    SkScalar run_x = x;
-
-    // Based on WebCore::skiaDrawText.
-    pos.resize(run->glyph_count);
-    for (int glyph = 0; glyph < run->glyph_count; glyph++) {
-        pos[glyph].set(x + run->offsets[glyph].du,
-                       y + run->offsets[glyph].dv);
-        x += SkIntToScalar(run->advance_widths[glyph]);
-    }
-
-    size_t byte_length = run->glyph_count * sizeof(WORD);
-    canvas_skia->drawPosText(run->glyphs.get(), byte_length, &pos[0], paint);
-
-    if (run->strike || run->underline)
-      DrawTextRunDecorations(canvas_skia, paint, *run, run_x, y);
-  }
-}
-
-void RenderTextWin::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());
-  }
-}
-
 RenderText* RenderText::CreateRenderText() {
   return new RenderTextWin;
 }
 
 }  // namespace gfx