Improve RenderTextWin font fallback.

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 49 matching lines @@
       split_style.range.set_end(new_range.start());
       i = style_ranges->insert(i, split_style) + 1;
       i->range.set_start(new_range.end());
       break;
     } else if (i->range.start() < new_range.start()) {
       i->range.set_end(new_range.start());
       i++;
     } else if (i->range.end() > new_range.end()) {
       i->range.set_start(new_range.end());
       break;
-    } else
+    } else {
       NOTREACHED();
+    }
   }
   // Add the new range in its sorted location.
   style_ranges->insert(i, style_range);
 }
 
 }  // namespace
 
 namespace gfx {
 
 StyleRange::StyleRange()
@@ skipping 99 matching lines @@
     if (break_type == WORD_BREAK)
       position = GetRightSelectionModel(position, break_type);
   } else {
     position = GetRightSelectionModel(position, break_type);
   }
   if (select)
     position.set_selection_start(GetSelectionStart());
   MoveCursorTo(position);
 }
 
-bool RenderText::MoveCursorTo(const SelectionModel& selection_model) {
-  SelectionModel sel(selection_model);
+bool RenderText::MoveCursorTo(const SelectionModel& model) {
+  SelectionModel sel(model);
   size_t text_length = text().length();
   // Enforce valid selection model components.
   if (sel.selection_start() > text_length)
     sel.set_selection_start(text_length);
   if (sel.selection_end() > text_length)
     sel.set_selection_end(text_length);
   // The current model only supports caret positions at valid character indices.
   if (text_length == 0) {
     sel.set_caret_pos(0);
     sel.set_caret_placement(SelectionModel::LEADING);
@@ skipping 158 matching lines @@
   int left_pos = 0;
   int right = font.GetStringWidth(text());
   int right_pos = text().length();
 
   int x = point.x() - (display_rect_.x() + GetUpdatedDisplayOffset().x());
   if (x <= left) return SelectionModel(left_pos);
   if (x >= right) return SelectionModel(right_pos);
   // binary searching the cursor position.
   // TODO(oshima): use the center of character instead of edge.
   // Binary search may not work for language like Arabic.
-  while (std::abs(static_cast<long>(right_pos - left_pos)) > 1) {
+  while (std::abs(right_pos - left_pos) > 1) {
     int pivot_pos = left_pos + (right_pos - left_pos) / 2;
     int pivot = font.GetStringWidth(text().substr(0, pivot_pos));
     if (pivot < x) {
       left = pivot;
       left_pos = pivot_pos;
     } else if (pivot == x) {
       return SelectionModel(pivot_pos);
     } else {
       right = pivot;
       right_pos = pivot_pos;
@@ skipping 41 matching lines @@
 
 const Point& RenderText::GetUpdatedDisplayOffset() {
   UpdateCachedBoundsAndOffset();
   return display_offset_;
 }
 
 SelectionModel RenderText::GetLeftSelectionModel(const SelectionModel& current,
                                                  BreakType break_type) {
   if (break_type == LINE_BREAK)
     return LeftEndSelectionModel();
-  size_t pos = std::max(static_cast<long>(current.selection_end() - 1),
-                        static_cast<long>(0));
+  size_t pos = std::max<int>(current.selection_end() - 1, 0);
   if (break_type == CHARACTER_BREAK)
     return SelectionModel(pos, pos, SelectionModel::LEADING);
 
   // Notes: We always iterate words from the beginning.
   // This is probably fast enough for our usage, but we may
   // want to modify WordIterator so that it can start from the
   // middle of string and advance backwards.
   base::i18n::BreakIterator iter(text(), base::i18n::BreakIterator::BREAK_WORD);
   bool success = iter.Init();
   DCHECK(success);
@@ skipping 53 matching lines @@
   SelectionModel::CaretPlacement placement = (caret_pos == cursor) ?
       SelectionModel::LEADING : SelectionModel::TRAILING;
   return SelectionModel(cursor, caret_pos, placement);
 }
 
 void RenderText::SetSelectionModel(const SelectionModel& model) {
   DCHECK_LE(model.selection_start(), text().length());
   selection_model_.set_selection_start(model.selection_start());
   DCHECK_LE(model.selection_end(), text().length());
   selection_model_.set_selection_end(model.selection_end());
-  DCHECK_LT(model.caret_pos(),
-            std::max(text().length(), static_cast<size_t>(1)));
+  DCHECK_LT(model.caret_pos(), std::max<size_t>(text().length(), 1));
   selection_model_.set_caret_pos(model.caret_pos());
   selection_model_.set_caret_placement(model.caret_placement());
 
   cached_bounds_and_offset_valid_ = false;
   UpdateLayout();
 }
 
 size_t RenderText::GetIndexOfPreviousGrapheme(size_t position) {
   return IndexOfAdjacentGrapheme(position, false);
 }
@@ skipping 92 matching lines @@
 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