Add RenderText DirectionalityMode enum and support; etc.

ui/gfx/render_text_linux.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_linux.h"
 
 #include <pango/pangocairo.h>
 #include <algorithm>
 #include <string>
 #include <vector>
@@ skipping 62 matching lines @@
       log_attrs_(NULL),
       num_log_attrs_(0),
       layout_text_(NULL),
       layout_text_len_(0) {
 }
 
 RenderTextLinux::~RenderTextLinux() {
   ResetLayout();
 }
 
-base::i18n::TextDirection RenderTextLinux::GetTextDirection() {
-  EnsureLayout();
-
-  PangoDirection base_dir = pango_find_base_dir(layout_text_, -1);
-  if (base_dir == PANGO_DIRECTION_RTL || base_dir == PANGO_DIRECTION_WEAK_RTL)
-    return base::i18n::RIGHT_TO_LEFT;
-  return base::i18n::LEFT_TO_RIGHT;
-}
-
 Size RenderTextLinux::GetStringSize() {
   EnsureLayout();
   int width = 0, height = 0;
   pango_layout_get_pixel_size(layout_, &width, &height);
   return Size(width, height);
 }
 
 int RenderTextLinux::GetBaseline() {
   EnsureLayout();
   return PANGO_PIXELS(pango_layout_get_baseline(layout_));
@@ skipping 179 matching lines @@
 
 void RenderTextLinux::EnsureLayout() {
   if (layout_ == NULL) {
     cairo_surface_t* surface =
         cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 0, 0);
     cairo_t* cr = cairo_create(surface);
 
     layout_ = pango_cairo_create_layout(cr);
     cairo_destroy(cr);
     cairo_surface_destroy(surface);
-    SetupPangoLayoutWithFontDescription(
-        layout_,
-        GetDisplayText(),
-        font_list().GetFontDescriptionString(),
-        display_rect().width(),
-        base::i18n::GetFirstStrongCharacterDirection(text()),
-        Canvas::DefaultCanvasTextAlignment());
+
+    SetupPangoLayoutWithFontDescription(layout_,
+                                        GetDisplayText(),
+                                        font_list().GetFontDescriptionString(),
+                                        display_rect().width(),
+                                        GetTextDirection(),
+                                        Canvas::DefaultCanvasTextAlignment());
+
+    // Set Pango's base text direction.
+    pango_context_set_base_dir(pango_layout_get_context(layout_),

[Alexei Svitkine (slow), 2012/07/31 23:33:29]

Should this be done in SetupPangoLayoutWithFontDescription()?

[msw, 2012/08/01 17:30:10]

Good idea! Moved lower to SetupPangoLayoutWithoutFont.

+        (GetTextDirection() == base::i18n::RIGHT_TO_LEFT ?
+         PANGO_DIRECTION_RTL : PANGO_DIRECTION_LTR));
 
     // No width set so that the x-axis position is relative to the start of the
     // text. ToViewPoint and ToTextPoint take care of the position conversion
     // between text space and view spaces.
     pango_layout_set_width(layout_, -1);
     // TODO(xji): If RenderText will be used for displaying purpose, such as
     // label, we will need to remove the single-line-mode setting.
     pango_layout_set_single_paragraph_mode(layout_, true);
 
     // These are used by SetupPangoAttributes.
@@ skipping 241 matching lines @@
   if (selection_visual_bounds_.empty())
     selection_visual_bounds_ = CalculateSubstringBounds(selection());
   return selection_visual_bounds_;
 }
 
 RenderText* RenderText::CreateInstance() {
   return new RenderTextLinux;
 }
 
 }  // namespace gfx