RenderTextHarfBuzz: Don't draw newline glyph.

ui/gfx/render_text_harfbuzz.cc

 // Copyright 2014 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_harfbuzz.h"
 
 #include <limits>
 #include <set>
 
 #include "base/i18n/bidi_line_iterator.h"
@@ skipping 187 matching lines @@
 }
 
 // A port of hb_icu_script_to_script because harfbuzz on CrOS is built without
 // hb-icu. See http://crbug.com/356929
 inline hb_script_t ICUScriptToHBScript(UScriptCode script) {
   if (script == USCRIPT_INVALID_CODE)
     return HB_SCRIPT_INVALID;
   return hb_script_from_string(uscript_getShortName(script), -1);
 }
 
+// Whether |segment| corresponds to the newline character.
+bool IsNewlineSegment(const base::string16& text,
+                      const internal::LineSegment& segment) {
+  return text[segment.char_range.start()] == '\n';
+}
+
 // Helper template function for |TextRunHarfBuzz::GetClusterAt()|. |Iterator|
 // can be a forward or reverse iterator type depending on the text direction.
 template <class Iterator>
 void GetClusterAtImpl(size_t pos,
                       Range range,
                       Iterator elements_begin,
                       Iterator elements_end,
                       bool reversed,
                       Range* chars,
                       Range* glyphs) {
@@ skipping 64 matching lines @@
     for (auto iter = words_->breaks().begin(); iter != words_->breaks().end();
          iter++) {
       const Range word_range = words_->GetRange(iter);
       std::vector<internal::LineSegment> word_segments;
       SkScalar word_width = GetWordWidth(word_range, &word_segments);
 
       // If the last word is '\n', we should advance a new line after adding
       // the word to the current line.
       bool new_line = false;
       if (!word_segments.empty() &&
-          text_[word_segments.back().char_range.start()] == '\n') {
+          IsNewlineSegment(text_, word_segments.back())) {
         new_line = true;
 
         // Since the line should at least contain some information regarding the
         // text range it corresponds to, don't pop the newline segment, if it's
         // the only segment in the line. This ensures that every line has a non-
-        // empty segments vector (except the last in some cases).
+        // empty segments vector (except the last in some cases). This segment
+        // won't be drawn though.
         if (word_segments.size() != 1u || available_width_ != max_width_) {
           word_width -= word_segments.back().width();
           word_segments.pop_back();
         }
       }
 
       // If the word is not the first word in the line and it can't fit into
       // the current line, advance a new line.
       if (word_width > available_width_ && available_width_ != max_width_)
         AdvanceLine();
@@ skipping 900 matching lines @@
   ApplyFadeEffects(renderer);
   ApplyTextShadows(renderer);
   ApplyCompositionAndSelectionStyles();
 
   internal::TextRunList* run_list = GetRunList();
   for (size_t i = 0; i < lines().size(); ++i) {
     const internal::Line& line = lines()[i];
     const Vector2d origin = GetLineOffset(i) + Vector2d(0, line.baseline);
     SkScalar preceding_segment_widths = 0;
     for (const internal::LineSegment& segment : line.segments) {
+      // Don't draw the newline glyph (crbug.com/680430).
+      if (IsNewlineSegment(GetDisplayText(), segment))
+        continue;
+
       const internal::TextRunHarfBuzz& run = *run_list->runs()[segment.run];
       renderer->SetTypeface(run.skia_face);
       renderer->SetTextSize(SkIntToScalar(run.font_size));
       renderer->SetFontRenderParams(run.render_params,
                                     subpixel_rendering_suppressed());
       Range glyphs_range = run.CharRangeToGlyphRange(segment.char_range);
       std::unique_ptr<SkPoint[]> positions(new SkPoint[glyphs_range.length()]);
       SkScalar offset_x = preceding_segment_widths -
                           ((glyphs_range.GetMin() != 0)
                                ? run.positions[glyphs_range.GetMin()].x()
@@ skipping 473 matching lines @@
 
       attribute.strike = run.strike;
       attribute.diagonal_strike = run.diagonal_strike;
       decorated_text->attributes.push_back(attribute);
     }
   }
   return true;
 }
 
 }  // namespace gfx