Fix RenderTextWin base dir and adjacent char code; remove test exceptions; 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"
 #include "base/logging.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_smoothing_win.h"
 #include "ui/gfx/platform_font_win.h"
@@ skipping 275 matching lines @@
   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() {
-  // TODO(benrg): Code moved from RenderText::GetTextDirection. Needs to be
-  // replaced by a correct Windows implementation.
-  if (base::i18n::IsRTL())
-    return base::i18n::RIGHT_TO_LEFT;
-  return base::i18n::LEFT_TO_RIGHT;
+  return base::i18n::GetFirstStrongCharacterDirection(text());

[Alexei Svitkine (slow), 2012/07/02 16:21:11]

What do you think of making this depend on EnsureLayout() and just returning a
value based on script_state_.uBidiLevel. (Thus being O(1) after layout.)

Of course, with a corresponding change to make
RenderTextWin::ItemizeLogicalText() use
base::i18n::GetFirstStrongCharacterDirection() instead of GetTextDirection().

[msw, 2012/07/02 19:54:49]

Done.

 }
 
 Size RenderTextWin::GetStringSize() {
   EnsureLayout();
   return string_size_;
 }
 
 int RenderTextWin::GetBaseline() {
   EnsureLayout();
   return common_baseline_;
@@ skipping 38 matching lines @@
 
   return spans;
 }
 
 SelectionModel RenderTextWin::AdjacentCharSelectionModel(
     const SelectionModel& selection,
     VisualCursorDirection direction) {
   DCHECK(!needs_layout_);
   internal::TextRun* run;
   size_t run_index = GetRunContainingCaret(selection);
-  if (run_index == runs_.size()) {
+  if (run_index >= runs_.size()) {
     // The cursor is not in any run: we're at the visual and logical edge.
     SelectionModel edge = EdgeSelectionModel(direction);
     if (edge.caret_pos() == selection.caret_pos())
       return edge;
-    run = direction == CURSOR_RIGHT ? runs_.front() : runs_.back();
+    int visual_index = (direction == CURSOR_RIGHT) ? 0 : runs_.size() - 1;
+    run = runs_[visual_to_logical_[visual_index]];
   } else {
     // If the cursor is moving within the current run, just move it by one
     // grapheme in the appropriate direction.
     run = runs_[run_index];
     size_t caret = selection.caret_pos();
     bool forward_motion =
         run->script_analysis.fRTL == (direction == CURSOR_LEFT);
     if (forward_motion) {
       if (caret < run->range.end()) {
         caret = IndexOfAdjacentGrapheme(caret, CURSOR_FORWARD);
@@ skipping 211 matching lines @@
 void RenderTextWin::ItemizeLogicalText() {
   runs_.reset();
   string_size_ = Size(0, GetFont().GetHeight());
   common_baseline_ = 0;
   if (text().empty())
     return;
 
   const wchar_t* raw_text = text().c_str();
   const int text_length = text().length();
 
+  // Initialize the base direction of the text.
+  script_state_.uBidiLevel =

[Alexei Svitkine (slow), 2012/07/02 16:21:11]

Can you clear uBidiLevel to 0 above the early return if text is empty? Then, you
can just do this here:

if (GetTextDirection() == base::i18n::RIGHT_TO_LEFT)
  script_state_.uBidiLevel = 1;

[msw, 2012/07/02 19:54:49]

Done.

+      (GetTextDirection() == base::i18n::LEFT_TO_RIGHT) ? 0 : 1;
+
   HRESULT hr = E_OUTOFMEMORY;
   int script_items_count = 0;
   std::vector<SCRIPT_ITEM> script_items;
   for (size_t n = kGuessItems; hr == E_OUTOFMEMORY && n < kMaxItems; n *= 2) {
     // Derive the array of Uniscribe script items from the logical text.
     // ScriptItemize always adds a terminal array item so that the length of the
     // last item can be derived from the terminal SCRIPT_ITEM::iCharPos.
     script_items.resize(n);
     hr = ScriptItemize(raw_text,
                        text_length,
@@ skipping 294 matching lines @@
     const internal::TextRun* run) {
   size_t caret = IndexOfAdjacentGrapheme(run->range.end(), CURSOR_BACKWARD);
   return SelectionModel(caret, CURSOR_FORWARD);
 }
 
 RenderText* RenderText::CreateRenderText() {
   return new RenderTextWin;
 }
 
 }  // namespace gfx