Remove code that forces text directionality.

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 94 matching lines @@
 
 void Label::SetShadowOffset(int x, int y) {
   shadow_offset_.SetPoint(x, y);
 }
 
 void Label::ClearEmbellishing() {
   has_shadow_ = false;
 }
 
 void Label::SetHorizontalAlignment(Alignment alignment) {
-  // If the View's UI layout is right-to-left and directionality_mode_ is
-  // USE_UI_DIRECTIONALITY, we need to flip the alignment so that the alignment
-  // settings take into account the text directionality.
-  if (base::i18n::IsRTL() && (directionality_mode_ == USE_UI_DIRECTIONALITY) &&
-      (alignment != ALIGN_CENTER))
+  // TODO(msw): Change Alignment to LEADING/TRAILING?
+  // TODO(msw): Check (and potentially flip) the alignment when setting text?
+  // TODO(msw): Check against multi-line label regressions (not RenderText)...
+  // If the string's directionality is right-to-left, flip the alignment.
+  if (base::i18n::GetFirstStrongCharacterDirection(text()) ==
+          base::i18n::RIGHT_TO_LEFT &&
+      alignment != ALIGN_CENTER) {
     alignment = (alignment == ALIGN_LEFT) ? ALIGN_RIGHT : ALIGN_LEFT;
+  }

[xji, 2012/07/10 19:59:57]

so the alignment is also based on text directionality?

I think the preferred way for UI string (not JS message) is alignment should be
the same as UI's direction.
so, texts are aligned consistently while directionality could be different.

so the logic should be:
if (string_is_ui_string && base::i18n::IsRTL() && alignment != ALIGN_CENTER)
  flip_alignment;

Also, this breaks the alignment for JS mesasge.

   if (horiz_alignment_ != alignment) {
     horiz_alignment_ = alignment;
     SchedulePaint();
   }
 }
 
 void Label::SetMultiLine(bool multi_line) {
   DCHECK(!multi_line || !elide_in_middle_);
   if (multi_line != is_multi_line_) {
     is_multi_line_ = multi_line;
@@ skipping 235 matching lines @@
   background_color_ = ui::NativeTheme::instance()->GetSystemColor(
       ui::NativeTheme::kColorId_LabelBackgroundColor);
   auto_color_readability_ = true;
   RecalculateColors();
   horiz_alignment_ = ALIGN_CENTER;
   is_multi_line_ = false;
   allow_character_break_ = false;
   elide_in_middle_ = false;
   is_email_ = false;
   collapse_when_hidden_ = false;
-  directionality_mode_ = USE_UI_DIRECTIONALITY;
   paint_as_focused_ = false;
   has_focus_border_ = false;
   enabled_shadow_color_ = 0;
   disabled_shadow_color_ = 0;
   shadow_offset_.SetPoint(1, 1);
   has_shadow_ = false;
 
   SetText(text);
 }
 
@@ skipping 50 matching lines @@
   return gfx::Rect(text_origin, text_size);
 }
 
 int Label::ComputeDrawStringFlags() const {
   int flags = 0;
 
   // We can't use subpixel rendering if the background is non-opaque.
   if (SkColorGetA(background_color_) != 0xFF)
     flags |= gfx::Canvas::NO_SUBPIXEL_RENDERING;
 
-  if (directionality_mode_ == AUTO_DETECT_DIRECTIONALITY) {
-    base::i18n::TextDirection direction =
-        base::i18n::GetFirstStrongCharacterDirection(text_);
-    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 flags;
 
   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.
@@ skipping 26 matching lines @@
 void Label::CalculateDrawStringParams(string16* paint_text,
                                       gfx::Rect* text_bounds,
                                       int* flags) const {
   DCHECK(paint_text && text_bounds && flags);
 
   if (!url_.is_empty()) {
     // TODO(jungshik) : Figure out how to get 'intl.accept_languages'
     // preference and use it when calling ElideUrl.
     *paint_text =
         ui::ElideUrl(url_, font_, GetAvailableRect().width(), std::string());
-
-    // An URLs is always treated as an LTR text and therefore we should
-    // explicitly mark it as such if the locale is RTL so that URLs containing
-    // Hebrew or Arabic characters are displayed correctly.
-    //
-    // Note that we don't check the View's UI layout setting in order to
-    // determine whether or not to insert the special Unicode formatting
-    // characters. We use the locale settings because an URL is always treated
-    // as an LTR string, even if its containing view does not use an RTL UI
-    // layout.
-    *paint_text = base::i18n::GetDisplayStringInLTRDirectionality(
-        *paint_text);
+    // Ensure that URLs have LTR directionality.
+    // TODO(msw): Check cases like "/\x05d0", "://\x05d0".
+    DCHECK_EQ(base::i18n::GetFirstStrongCharacterDirection(*paint_text),
+              base::i18n::LEFT_TO_RIGHT);
   } else if (is_email_) {
     *paint_text = ui::ElideEmail(text_, font_, GetAvailableRect().width());
   } 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 = ComputeDrawStringFlags();
 }
 
 }  // namespace views