Simplify handling of BiDi cursor movement

ui/gfx/render_text_win.h

Index: ui/gfx/render_text_win.h
diff --git a/ui/gfx/render_text_win.h b/ui/gfx/render_text_win.h
index 8df7fa770c5273466d9a896861bbc14a2d65ffd6..5722ec9859b02b47e0ca37ddcc9257468343d910 100644
--- a/ui/gfx/render_text_win.h
+++ b/ui/gfx/render_text_win.h
@@ -65,10 +65,8 @@ class RenderTextWin : public RenderText {
 
   // Overridden from RenderText:
   virtual base::i18n::TextDirection GetTextDirection() OVERRIDE;
-  virtual int GetStringWidth() OVERRIDE;
+  virtual Size GetStringSize() OVERRIDE;
   virtual SelectionModel FindCursorPosition(const Point& point) OVERRIDE;
-  virtual Rect GetCursorBounds(const SelectionModel& selection,
-                               bool insert_mode) OVERRIDE;
 
  protected:
   // Overridden from RenderText:
@@ -78,9 +76,10 @@ class RenderTextWin : public RenderText {
   virtual SelectionModel AdjacentWordSelectionModel(
       const SelectionModel& selection,
       VisualCursorDirection direction) OVERRIDE;
-  virtual SelectionModel EdgeSelectionModel(
-      VisualCursorDirection direction) OVERRIDE;
-  virtual std::vector<Rect> GetSubstringBounds(size_t from, size_t to) OVERRIDE;
+  virtual void GetGlyphBounds(size_t index,
+                              ui::Range* xspan,
+                              int* height) OVERRIDE;
+  virtual std::vector<Rect> GetSubstringBounds(ui::Range range) OVERRIDE;
   virtual void SetSelectionModel(const SelectionModel& model) OVERRIDE;
   virtual bool IsCursorablePosition(size_t position) OVERRIDE;
   virtual void UpdateLayout() OVERRIDE;
@@ -97,7 +96,7 @@ class RenderTextWin : public RenderText {
 
   // Return the run index that contains the argument; or the length of the
   // |runs_| vector if argument exceeds the text length or width.
-  size_t GetRunContainingPosition(size_t position) const;
+  size_t GetRunContainingCaret(const SelectionModel& caret) const;
   size_t GetRunContainingPoint(const Point& point) const;
 
   // Given a |run|, returns the SelectionModel that contains the logical first