Paint text cursor in LAYER_SOLID_COLOR

ui/gfx/render_text.cc

 // Copyright (c) 2012 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 <limits.h>
 
 #include <algorithm>
 #include <climits>
@@ skipping 846 matching lines @@
     Rect clip_rect(display_rect());
     clip_rect.Inset(ShadowValue::GetMargin(shadows_));
 
     canvas->Save();
     canvas->ClipRect(clip_rect);
   }
 
   if (!text().empty() && focused())
     DrawSelection(canvas);
 
-  if (cursor_enabled() && cursor_visible() && focused())
-    DrawCursor(canvas, selection_model_);
-
   if (!text().empty()) {
     internal::SkiaTextRenderer renderer(canvas);
     if (halo_effect())
       renderer.SetHaloEffect();
     DrawVisualText(&renderer);
   }
 
   if (clip_to_display_rect())
     canvas->Restore();
 }
 
 void RenderText::DrawCursor(Canvas* canvas, const SelectionModel& position) {

[msw, 2017/02/13 21:27:12]

Can you remove this function and inline similar functionality in textfield.cc
for the drop cursor? It doesn't make sense to keep this function for just that.
Once this is removed, please also remove |cursor_color_|. It looks like we'll
need to keep |cursor_enabled_| to reserve space for rendering the cursor.

[yiyix, 2017/02/15 16:56:32]

Inline it it's a good idea. I will remove the todo and delete cursor_color_.
Thanks.

   // Paint cursor. Replace cursor is drawn as rectangle for now.
   // TODO(msw): Draw a better cursor with a better indication of association.
   canvas->FillRect(GetCursorBounds(position, true), cursor_color_);
 }
 
 bool RenderText::IsValidLogicalIndex(size_t index) const {
   // Check that the index is at a valid code point (not mid-surrgate-pair) and
   // that it's not truncated from the display text (its glyph may be shown).
   //
   // Indices within truncated text are disallowed so users can easily interact
@@ skipping 180 matching lines @@
   if (range.IsValid() && range.GetMin() < text().length())
     return text().substr(range.GetMin(), range.length());
   return base::string16();
 }
 
 RenderText::RenderText()
     : horizontal_alignment_(base::i18n::IsRTL() ? ALIGN_RIGHT : ALIGN_LEFT),
       directionality_mode_(DIRECTIONALITY_FROM_TEXT),
       text_direction_(base::i18n::UNKNOWN_DIRECTION),
       cursor_enabled_(true),
-      cursor_visible_(false),
       cursor_color_(kDefaultColor),
       selection_color_(kDefaultColor),
       selection_background_focused_color_(kDefaultSelectionBackgroundColor),
       focused_(false),
       composition_range_(Range::InvalidRange()),
       colors_(kDefaultColor),
       baselines_(NORMAL_BASELINE),
       weights_(Font::Weight::NORMAL),
       styles_(NUM_TEXT_STYLES),
       composition_and_selection_styles_applied_(false),
@@ skipping 621 matching lines @@
 
   for (; range_max < length; ++range_max)
     if (iter.IsEndOfWord(range_max) || iter.IsStartOfWord(range_max))
       break;
 
   return range.is_reversed() ? Range(range_max, range_min)
                              : Range(range_min, range_max);
 }
 
 }  // namespace gfx