Support float widths in RenderTextHarfBuzz.

ui/gfx/render_text_win.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_win.h"
 
 #include <algorithm>
 
 #include "base/i18n/break_iterator.h"
 #include "base/i18n/char_iterator.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "third_party/icu/source/common/unicode/uchar.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_fallback_win.h"
 #include "ui/gfx/font_render_params.h"
+#include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/platform_font_win.h"
 #include "ui/gfx/utf16_indexing.h"
 
 namespace gfx {
 
 namespace {
 
 // The maximum length of text supported for Uniscribe layout and display.
 // This empirically chosen value should prevent major performance degradations.
 // TODO(msw): Support longer text, partial layout/painting, etc.
@@ skipping 352 matching lines @@
         line_descent_ = min_height_ - min_baseline_;
       }
       // Set the single-line mode Line's metrics to be at least
       // |RenderText::font_list()| to not break the current single-line code.
       line_ascent_ = std::max(line_ascent_, min_baseline_);
       line_descent_ = std::max(line_descent_, min_height_ - min_baseline_);
 
       line->baseline = line_ascent_;
       line->size.set_height(line_ascent_ + line_descent_);
       line->preceding_heights = total_size_.height();
-      total_size_.set_height(total_size_.height() + line->size.height());
-      total_size_.set_width(std::max(total_size_.width(), line->size.width()));
+      const Size line_size(ToCeiledSize(line->size));
+      total_size_.set_height(total_size_.height() + line_size.height());
+      total_size_.set_width(std::max(total_size_.width(), line_size.width()));
     }
     line_x_ = 0;
     line_ascent_ = 0;
     line_descent_ = 0;
     lines_.push_back(Line());
   }
 
   // Adds a new segment with the given properties to |lines_.back()|.
   void AddSegment(int run_index, Range char_range, int width) {
     if (char_range.is_empty()) {
@@ skipping 351 matching lines @@
       background_is_transparent());
 
   ApplyCompositionAndSelectionStyles();
 
   for (size_t i = 0; i < lines().size(); ++i) {
     const internal::Line& line = lines()[i];
     const Vector2d line_offset = GetLineOffset(i);
 
     // Skip painting empty lines or lines outside the display rect area.
     if (!display_rect().Intersects(Rect(PointAtOffsetFromOrigin(line_offset),
-                                        line.size)))
+                                        ToCeiledSize(line.size))))
       continue;
 
     const Vector2d text_offset = line_offset + Vector2d(0, line.baseline);
     int preceding_segment_widths = 0;
 
     for (size_t j = 0; j < line.segments.size(); ++j) {
       const internal::LineSegment* segment = &line.segments[j];
       const int segment_width = segment->x_range.length();
       const internal::TextRun* run = runs_[segment->run];
       DCHECK(!segment->char_range.is_empty());
@@ skipping 446 matching lines @@
   size_t position = LayoutIndexToTextIndex(run->range.end());
   position = IndexOfAdjacentGrapheme(position, CURSOR_BACKWARD);
   return SelectionModel(position, CURSOR_FORWARD);
 }
 
 RenderText* RenderText::CreateNativeInstance() {
   return new RenderTextWin;
 }
 
 }  // namespace gfx