Add RenderText DirectionalityMode enum and support; etc.

ui/gfx/render_text_win.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_win.h"
 
 #include <algorithm>
 
 #include "base/i18n/break_iterator.h"
 #include "base/i18n/rtl.h"
@@ skipping 287 matching lines @@
       needs_layout_(false) {
   memset(&script_control_, 0, sizeof(script_control_));
   memset(&script_state_, 0, sizeof(script_state_));
 
   MoveCursorTo(EdgeSelectionModel(CURSOR_LEFT));
 }
 
 RenderTextWin::~RenderTextWin() {
 }
 
-base::i18n::TextDirection RenderTextWin::GetTextDirection() {
-  EnsureLayout();
-  return (script_state_.uBidiLevel == 0) ?
-      base::i18n::LEFT_TO_RIGHT : base::i18n::RIGHT_TO_LEFT;
-}
-
 Size RenderTextWin::GetStringSize() {
   EnsureLayout();
   return string_size_;
 }
 
 int RenderTextWin::GetBaseline() {
   EnsureLayout();
   return common_baseline_;
 }
 
@@ skipping 269 matching lines @@
 
     x = glyph_x;
   }
 }
 
 void RenderTextWin::ItemizeLogicalText() {
   runs_.clear();
   string_size_ = Size(0, GetFont().GetHeight());
   common_baseline_ = 0;
 
-  // Use the first strong character direction as the base text direction.
-  // TODO(msw): Use the application text direction instead of LTR by default?
+  // Set the base text direction yeilded by the directionality mode.

[Alexei Svitkine (slow), 2012/07/30 22:29:16]

Nit: yielded. Although, the comment isn't really correct.

In this case, you're not looking at the directionality mode (that's an
implementation detail of GetTextDirection()).

Perhaps just: "Set Uniscribe text direction." or even omit entirely.

[msw, 2012/07/31 03:03:06]

Done ("Set Uniscribe's base text direction."), similar for Pango.

   script_state_.uBidiLevel =
-      (base::i18n::GetFirstStrongCharacterDirection(text()) ==
-           base::i18n::RIGHT_TO_LEFT) ? 1 : 0;
+      (GetTextDirection() == base::i18n::RIGHT_TO_LEFT) ? 1 : 0;
 
   if (text().empty())
     return;
 
   const wchar_t* raw_text = text().c_str();
   const int text_length = text().length();
 
   HRESULT hr = E_OUTOFMEMORY;
   int script_items_count = 0;
   std::vector<SCRIPT_ITEM> script_items;
@@ skipping 334 matching lines @@
     const internal::TextRun* run) {
   size_t caret = IndexOfAdjacentGrapheme(run->range.end(), CURSOR_BACKWARD);
   return SelectionModel(caret, CURSOR_FORWARD);
 }
 
 RenderText* RenderText::CreateInstance() {
   return new RenderTextWin;
 }
 
 }  // namespace gfx