Type conversion fixes, text rendering edition.

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"
@@ skipping 784 matching lines @@
       pos.resize(glyph_range.length() + 1);
       for (size_t k = glyph_range.start(); k < glyph_range.end(); ++k) {
         pos[k - glyph_range.start()].set(
             SkIntToScalar(text_offset.x() + run->offsets[k].du + segment_x),
             SkIntToScalar(text_offset.y() - run->offsets[k].dv));
         segment_x += run->advance_widths[k];
       }
       pos.back().set(SkIntToScalar(text_offset.x() + segment_x),
                      SkIntToScalar(text_offset.y()));
 
-      renderer.SetTextSize(run->font.GetFontSize());
+      renderer.SetTextSize(SkIntToScalar(run->font.GetFontSize()));
       renderer.SetFontFamilyWithStyle(run->font.GetFontName(), run->font_style);
 
       for (BreakList<SkColor>::const_iterator it =
                colors().GetBreak(segment->char_range.start());
            it != colors().breaks().end() &&
                it->first < segment->char_range.end();
            ++it) {
         const Range intersection =
             colors().GetRange(it).Intersect(segment->char_range);
         const Range colored_glyphs = CharRangeToGlyphRange(*run, intersection);
         // The range may be empty if a portion of a multi-character grapheme is
         // selected, yielding two colors for a single glyph. For now, this just
         // paints the glyph with a single style, but it should paint it twice,
         // clipped according to selection bounds. See http://crbug.com/366786
         if (colored_glyphs.is_empty())
           continue;
         DCHECK(glyph_range.Contains(colored_glyphs));
         const SkPoint& start_pos =
             pos[colored_glyphs.start() - glyph_range.start()];
         const SkPoint& end_pos =
             pos[colored_glyphs.end() - glyph_range.start()];
 
         renderer.SetForegroundColor(it->second);
         renderer.DrawPosText(&start_pos, &run->glyphs[colored_glyphs.start()],
                              colored_glyphs.length());
-        renderer.DrawDecorations(start_pos.x(), text_offset.y(),
-                                 SkScalarCeilToInt(end_pos.x() - start_pos.x()),
-                                 run->underline, run->strike,
-                                 run->diagonal_strike);
+        renderer.DrawDecorations(
+            SkScalarFloorToInt(start_pos.x()), text_offset.y(),

[msw, 2014/10/17 22:13:23]

Like my other DrawDecorations suggestion, perhaps this should round?

[Peter Kasting, 2014/10/21 01:20:46]

Done.

+            SkScalarCeilToInt(end_pos.x() - start_pos.x()), run->underline,
+            run->strike, run->diagonal_strike);
       }
 
       preceding_segment_widths += segment_width;
     }
 
     renderer.EndDiagonalStrike();
   }
 
   UndoCompositionAndSelectionStyles();
 }
@@ skipping 251 matching lines @@
   }
 
   // Finally, initialize |glyph_count|, |glyphs|, |visible_attributes| and
   // |logical_clusters| on the run (since they may not have been set yet).
   run->glyph_count = run_length;
   memset(run->visible_attributes.get(), 0,
          run->glyph_count * sizeof(SCRIPT_VISATTR));
   for (int i = 0; i < run->glyph_count; ++i)
     run->glyphs[i] = IsWhitespace(run_text[i]) ? space_glyph : missing_glyph;
   for (size_t i = 0; i < run_length; ++i) {
-    run->logical_clusters[i] = run->script_analysis.fRTL ?
-        run_length - 1 - i : i;
+    run->logical_clusters[i] =
+        static_cast<WORD>(run->script_analysis.fRTL ? run_length - 1 - i : i);
   }
 
   // TODO(msw): Don't use SCRIPT_UNDEFINED. Apparently Uniscribe can
   //            crash on certain surrogate pairs with SCRIPT_UNDEFINED.
   //            See https://bugzilla.mozilla.org/show_bug.cgi?id=341500
   //            And http://maxradi.us/documents/uniscribe/
   run->script_analysis.eScript = SCRIPT_UNDEFINED;
 }
 
 HRESULT RenderTextWin::ShapeTextRunWithFont(internal::TextRun* run,
@@ skipping 106 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