Fix right-to-left script text truncation

ui/views/controls/label.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/views/controls/label.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <vector>
@@ skipping 197 matching lines @@
   return prefsize;
 }
 
 int Label::GetHeightForWidth(int w) {
   if (!is_multi_line_)
     return View::GetHeightForWidth(w);
 
   w = std::max(0, w - GetInsets().width());
   int h = font_.GetHeight();
   gfx::CanvasSkia::SizeStringInt(text_, font_, &w, &h,
-                                 ComputeMultiLineFlags());
+                                 ComputeDrawStringFlags());
   return h + GetInsets().height();
 }
 
 std::string Label::GetClassName() const {
   return kViewClassName;
 }
 
 bool Label::HitTest(const gfx::Point& l) const {
   return false;
 }
@@ skipping 54 matching lines @@
   if (!text_size_valid_) {
     // For single-line strings, we supply the largest possible width, because
     // while adding NO_ELLIPSIS to the flags works on Windows for forcing
     // SizeStringInt() to calculate the desired width, it doesn't seem to work
     // on Linux.
     int w = is_multi_line_ ?
         GetAvailableRect().width() : std::numeric_limits<int>::max();
     int h = font_.GetHeight();
     // For single-line strings, ignore the available width and calculate how
     // wide the text wants to be.
-    int flags = ComputeMultiLineFlags();
+    int flags = ComputeDrawStringFlags();
     if (!is_multi_line_)
       flags |= gfx::Canvas::NO_ELLIPSIS;
     gfx::CanvasSkia::SizeStringInt(text_, font_, &w, &h, flags);
     text_size_.SetSize(w, h);
     text_size_valid_ = true;
   }
 
   return text_size_;
 }
 
@@ skipping 115 matching lines @@
       break;
     default:
       NOTREACHED();
       break;
   }
   text_origin.Offset(0,
       std::max(0, (available_rect.height() - text_size.height())) / 2);
   return gfx::Rect(text_origin, text_size);
 }
 
-int Label::ComputeMultiLineFlags() const {
+int Label::ComputeDrawStringFlags() const {
+  int flags = 0;
+
+  if (directionality_mode_ == AUTO_DETECT_DIRECTIONALITY) {
+    base::i18n::TextDirection direction =
+        base::i18n::GetFirstStrongCharacterDirection(GetText());
+    if (direction == base::i18n::RIGHT_TO_LEFT)
+      flags |= gfx::Canvas::FORCE_RTL_DIRECTIONALITY;
+    else
+      flags |= gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
+  }
+
   if (!is_multi_line_)
-    return 0;
+    return flags;
 
-  int flags = gfx::Canvas::MULTI_LINE;
+  flags |= gfx::Canvas::MULTI_LINE;
 #if !defined(OS_WIN)
     // Don't elide multiline labels on Linux.
     // Todo(davemoore): Do we depend on eliding multiline text?
     // Pango insists on limiting the number of lines to one if text is
     // elided. You can get around this if you can pass a maximum height
     // but we don't currently have that data when we call the pango code.
     flags |= gfx::Canvas::NO_ELLIPSIS;
 #endif
   if (allow_character_break_)
     flags |= gfx::Canvas::CHARACTER_BREAK;
   switch (horiz_alignment_) {
     case ALIGN_LEFT:
       flags |= gfx::Canvas::TEXT_ALIGN_LEFT;
       break;
     case ALIGN_CENTER:
       flags |= gfx::Canvas::TEXT_ALIGN_CENTER;
       break;
     case ALIGN_RIGHT:
       flags |= gfx::Canvas::TEXT_ALIGN_RIGHT;
       break;
   }
+
   return flags;
 }
 
 gfx::Rect Label::GetAvailableRect() const {
   gfx::Rect bounds(gfx::Point(), size());
   gfx::Insets insets(GetInsets());
   bounds.Inset(insets.left(), insets.top(), insets.right(), insets.bottom());
   return bounds;
 }
 
@@ skipping 20 matching lines @@
     *paint_text = base::i18n::GetDisplayStringInLTRDirectionality(
         *paint_text);
   } else if (elide_in_middle_) {
     *paint_text = ui::ElideText(text_, font_, GetAvailableRect().width(),
                                 ui::ELIDE_IN_MIDDLE);
   } else {
     *paint_text = text_;
   }
 
   *text_bounds = GetTextBounds();
-  *flags = ComputeMultiLineFlags();
-
-  if (directionality_mode_ == AUTO_DETECT_DIRECTIONALITY) {
-    base::i18n::TextDirection direction =
-        base::i18n::GetFirstStrongCharacterDirection(GetText());
-    if (direction == base::i18n::RIGHT_TO_LEFT)
-      *flags |= gfx::Canvas::FORCE_RTL_DIRECTIONALITY;
-    else
-      *flags |= gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
-  }
+  *flags = ComputeDrawStringFlags();
 }
 
 }  // namespace views