Added a flag to the Canvas class which allows forcing an RTL directionality...

chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc

 // Copyright (c) 2009 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 "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
 #include "app/gfx/insets.h"
 #include "app/gfx/path.h"
@@ skipping 129 matching lines @@
                  bool force_dim,
                  int x,
                  int y);
 
   // Draws an individual sub-fragment with the specified style. Returns the x
   // position to the right of the fragment.
   int DrawStringFragment(gfx::Canvas* canvas,
                          const std::wstring& text,
                          int style,
                          int x,
-                         int y);
+                         int y,
+                         bool force_rtl_directionality);
 
   // Gets the font and text color for a fragment with the specified style.
   gfx::Font GetFragmentFont(int style) const;
   SkColor GetFragmentTextColor(int style) const;
 
   // This row's model and model index.
   AutocompleteResultViewModel* model_;
   size_t model_index_;
 
   // The font used to derive fonts for rendering the text in this row.
@@ skipping 345 matching lines @@
       size_t i = mirroring_context_->GetClassification(
           classification, classifications.size(), run_direction == UBIDI_RTL);
       size_t text_start = std::max(static_cast<size_t>(run_start),
                                    classifications[i].offset);
       size_t text_end = std::min(static_cast<size_t>(run_end),
           i < classifications.size() - 1 ?
           classifications[i + 1].offset : run_end);
       int style = classifications[i].style;
       if (force_dim)
         style |= ACMatchClassification::DIM;
+
+      // We specify RTL directionlity explicitly only if the run is an RTL run
+      // and we can't specify the string directionlaity using an LRE/PDF pair.
+      // Note that URLs are always displayed using LTR directionality
+      // (regardless of the locale) and therefore they are excluded.
+      const bool force_rtl_directionality =
+           !(classifications[i].style & ACMatchClassification::URL) &&
+           (run_direction == UBIDI_RTL) &&
+           (l10n_util::GetTextDirection() == l10n_util::LEFT_TO_RIGHT);
+
       if (text_start < text_end) {
         x += DrawStringFragment(canvas,
                                 text.substr(text_start, text_end - text_start),
-                                style, x, y);
+                                style, x, y, force_rtl_directionality);
       }
     }
   }
   return x;
 }
 
 int AutocompleteResultView::DrawStringFragment(
     gfx::Canvas* canvas,
     const std::wstring& text,
     int style,
     int x,
-    int y) {
+    int y,
+    bool force_rtl_directionality) {
   gfx::Font display_font = GetFragmentFont(style);
   // Clamp text width to the available width within the popup so we elide if
   // necessary.
   int string_width = std::min(display_font.GetStringWidth(text),
                               width() - kRowRightPadding - x);
   int string_left = mirroring_context_->GetLeft(x, x + string_width);
+  const int flags = force_rtl_directionality ?
+      gfx::Canvas::FORCE_RTL_DIRECTIONALITY : 0;
   canvas->DrawStringInt(text, GetFragmentFont(style),
                         GetFragmentTextColor(style), string_left, y,
-                        string_width, display_font.height());
+                        string_width, display_font.height(), flags);
   return string_width;
 }
 
 gfx::Font AutocompleteResultView::GetFragmentFont(int style) const {
   return (style & ACMatchClassification::MATCH) ?
       font_.DeriveFont(0, gfx::Font::BOLD) : font_;
 }
 
 SkColor AutocompleteResultView::GetFragmentTextColor(int style) const {
   const ResultViewState state = GetState();
@@ skipping 324 matching lines @@
 // static
 AutocompletePopupView* AutocompletePopupView::CreatePopupView(
     const gfx::Font& font,
     AutocompleteEditView* edit_view,
     AutocompleteEditModel* edit_model,
     Profile* profile,
     const BubblePositioner* bubble_positioner) {
   return new AutocompletePopupContentsView(font, edit_view, edit_model,
                                            profile, bubble_positioner);
 }