Clean up some code in view_text_utils.cc.

ui/views/view_text_utils.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/views/view_text_utils.h"
 
 #include "base/i18n/bidi_line_iterator.h"
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 73 matching lines @@
 void DrawTextStartingFrom(gfx::Canvas* canvas,
                           views::Label* label,
                           const string16& text,
                           gfx::Size* position,
                           const gfx::Rect& bounds,
                           const gfx::Font& font,
                           bool text_direction_is_rtl,
                           bool ltr_within_rtl) {
   // Iterate through line breaking opportunities (which in English would be
   // spaces and such). This tells us where to wrap.
-  string16 text16(text);
-  base::i18n::BreakIterator iter(text16,
+  base::i18n::BreakIterator iter(text,
                                  base::i18n::BreakIterator::BREAK_SPACE);
   if (!iter.Init())
     return;
 
   int flags = (text_direction_is_rtl ? gfx::Canvas::TEXT_ALIGN_RIGHT :
                                        gfx::Canvas::TEXT_ALIGN_LEFT);
-  flags |= gfx::Canvas::MULTI_LINE | gfx::Canvas::HIDE_PREFIX;
+  flags |= gfx::Canvas::MULTI_LINE | gfx::Canvas::HIDE_PREFIX |
+           gfx::Canvas::NO_ELLIPSIS;
 
   // Iterate over each word in the text, or put in a more locale-neutral way:
   // iterate to the next line breaking opportunity.
   while (iter.Advance()) {
     // Get the word and figure out the dimensions.
     string16 word;
     if (!ltr_within_rtl)
       word = iter.GetString();  // Get the next word.
     else
-      word = text16;  // Draw the whole text at once.
+      word = text;  // Draw the whole text at once.
 
-    int w = font.GetStringWidth(word), h = font.GetHeight();
+    int w = 0, h = 0;
     gfx::CanvasSkia::SizeStringInt(word, font, &w, &h, flags);
 
     // If we exceed the boundaries, we need to wrap.
     WrapIfWordDoesntFit(w, font.GetHeight(), position, bounds);
 
     int x = label->GetMirroredXInView(position->width()) + bounds.x();
     if (text_direction_is_rtl) {
       x -= w;
       // When drawing LTR strings inside RTL text we need to make sure we
       // draw the trailing space (if one exists after the LTR text) to the
       // left of the LTR string.
-      if (ltr_within_rtl && word[word.size() - 1] == ' ') {
-        int space_w = font.GetStringWidth(ASCIIToUTF16(" "));
-        int space_h = font.GetHeight();
-        gfx::CanvasSkia::SizeStringInt(ASCIIToUTF16(" "), font, &space_w,
-                                       &space_h, flags);
-        x += space_w;
-      }
+      if (ltr_within_rtl && word[word.size() - 1] == ' ')
+        x += gfx::CanvasSkia::GetStringWidth(ASCIIToUTF16(" "), font);
     }
     int y = position->height() + bounds.y();
 
     // Draw the text on the screen (mirrored, if RTL run).
     canvas->DrawStringInt(word, font, label->enabled_color(), x, y, w,
                           font.GetHeight(), flags);
 
     if (!word.empty() && word[word.size() - 1] == '\x0a') {
       // When we come across '\n', we move to the beginning of the next line.
       position->set_width(0);
@@ skipping 12 matching lines @@
                          int font_height,
                          gfx::Size* position,
                          const gfx::Rect& bounds) {
   if (position->width() + word_width > bounds.right()) {
     position->set_width(0);
     position->Enlarge(0, font_height);
   }
 }
 
 }  // namespace view_text_utils