Merge 144791 - Fix tab title fading direction in RTL locales.

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 "base/i18n/break_iterator.h"
 #include "base/logging.h"
@@ skipping 831 matching lines @@
   if (text_width <= display_width)
     return;
 
   int gradient_width = CalculateFadeGradientWidth(GetFont(), display_width);
   if (gradient_width == 0)
     return;
 
   bool fade_left = fade_head();
   bool fade_right = fade_tail();
   // Under RTL, |fade_right| == |fade_head|.
-  if (GetTextDirection() == base::i18n::RIGHT_TO_LEFT)
+  // TODO(asvitkine): This is currently not based on GetTextDirection() because
+  //                  RenderTextWin does not return a direction that's based on
+  //                  the text content.
+  if (horizontal_alignment() == ALIGN_RIGHT)
     std::swap(fade_left, fade_right);
 
   gfx::Rect solid_part = display_rect();
   gfx::Rect left_part;
   gfx::Rect right_part;
   if (fade_left) {
     left_part = solid_part;
     left_part.Inset(0, 0, solid_part.width() - gradient_width, 0);
     solid_part.Inset(gradient_width, 0, 0, 0);
   }
@@ skipping 98 matching lines @@
   if (cursor_enabled() && cursor_visible() && focused()) {
     const Rect& bounds = GetUpdatedCursorBounds();
     if (bounds.width() != 0)
       canvas->FillRect(bounds, cursor_color_);
     else
       canvas->DrawRect(bounds, cursor_color_);
   }
 }
 
 }  // namespace gfx