Revert 109977 - Implement font fallback in RenderTextWin.

ui/gfx/render_text_win.h

Index: ui/gfx/render_text_win.h
===================================================================
--- ui/gfx/render_text_win.h	(revision 109999)
+++ ui/gfx/render_text_win.h	(working copy)
@@ -43,7 +43,6 @@
   scoped_array<int> advance_widths;
   scoped_array<GOFFSET> offsets;
   ABC abc_widths;
-  SCRIPT_CACHE script_cache;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TextRun);
@@ -90,8 +89,8 @@
   // Given a |run|, returns the SelectionModel that contains the logical first
   // or last caret position inside (not at a boundary of) the run.
   // The returned value represents a cursor/caret position without a selection.
-  SelectionModel FirstSelectionModelInsideRun(internal::TextRun* run);
-  SelectionModel LastSelectionModelInsideRun(internal::TextRun* run);
+  SelectionModel FirstSelectionModelInsideRun(internal::TextRun*);
+  SelectionModel LastSelectionModelInsideRun(internal::TextRun*);
 
   // Get the selection model visually left/right of |selection| by one grapheme.
   // The returned value represents a cursor/caret position without a selection.
@@ -112,6 +111,8 @@
   SCRIPT_CONTROL script_control_;
   SCRIPT_STATE script_state_;
 
+  SCRIPT_CACHE script_cache_;
+
   std::vector<internal::TextRun*> runs_;
   int string_width_;
 
Property changes on: ui\gfx\render_text_win.h
___________________________________________________________________
Deleted: svn:mergeinfo