Strip carriage return from find text; show newline symbols.

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 <algorithm>
 #include <climits>
 
 #include "base/command_line.h"
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/icu/source/common/unicode/rbbi.h"
 #include "third_party/icu/source/common/unicode/utf16.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/render_text_harfbuzz.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/skia_util.h"
@@ skipping 1140 matching lines @@
   }
 
   if (elide_behavior_ != TRUNCATE && elide_behavior_ != FADE_TAIL &&
       display_rect_.width() > 0 && !layout_text_.empty() &&
       GetContentWidth() > display_rect_.width()) {
     // This doesn't trim styles so ellipsis may get rendered as a different
     // style than the preceding text. See crbug.com/327850.
     layout_text_.assign(ElideText(layout_text_));
   }
 
+  // Replace the newline character with a newline symbol in single line mode.
+  static const base::char16 kNewline[] = { '\n', 0 };
+  static const base::char16 kNewlineSymbol[] = { 0x2424, 0 };
+  if (!multiline_)
+    base::ReplaceChars(layout_text_, kNewline, kNewlineSymbol, &layout_text_);

[Peter Kasting, 2014/07/09 00:27:05]

Again, just call with string constants directly instead of character arrays.

[msw, 2014/07/09 00:40:12]

Done.

+
   ResetLayout();
 }
 
 // TODO(skanuj): Fix code duplication with ElideText in ui/gfx/text_elider.cc
 // See crbug.com/327846
 base::string16 RenderText::ElideText(const base::string16& text) {
   const bool insert_ellipsis = (elide_behavior_ != TRUNCATE);
   // Create a RenderText copy with attributes that affect the rendering width.
   scoped_ptr<RenderText> render_text(CreateInstance());
   render_text->SetFontList(font_list_);
@@ skipping 131 matching lines @@
   cursor_bounds_ += delta_offset;
 }
 
 void RenderText::DrawSelection(Canvas* canvas) {
   const std::vector<Rect> sel = GetSubstringBounds(selection());
   for (std::vector<Rect>::const_iterator i = sel.begin(); i < sel.end(); ++i)
     canvas->FillRect(*i, selection_background_focused_color_);
 }
 
 }  // namespace gfx