Replace StyleRange with BreakList; update RenderText, etc.

ui/gfx/render_text_win.h

 // 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.
 
 #ifndef UI_GFX_RENDER_TEXT_WIN_H_
 #define UI_GFX_RENDER_TEXT_WIN_H_
 
 #include <usp10.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/gfx/render_text.h"
 
 namespace gfx {
 
 namespace internal {
 
 struct TextRun {
   TextRun();
   ~TextRun();
 
   ui::Range range;
   Font font;
-  // TODO(msw): Disambiguate color, strike, etc. from TextRuns.
-  //            Otherwise, this breaks the glyph shaping process.
-  //            See the example at: http://www.catch22.net/tuts/neatpad/12.
-  SkColor foreground;
   // A gfx::Font::FontStyle flag to specify bold and italic styles.
   // Supersedes |font.GetFontStyle()|. Stored separately to avoid calling
   // |font.DeriveFont()|, which is expensive on Windows.
   int font_style;
+
+  // TODO(msw): Disambiguate color/style from TextRuns for proper glyph shaping.
+  //            See an example: http://www.catch22.net/tuts/uniscribe-mysteries
+  SkColor foreground;
   bool strike;
   bool diagonal_strike;
   bool underline;
 
   int width;
   // The cumulative widths of preceding runs.
   int preceding_run_widths;
 
   SCRIPT_ANALYSIS script_analysis;
 
@@ skipping 89 matching lines @@
   scoped_ptr<int[]> logical_to_visual_;
 
   bool needs_layout_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderTextWin);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_RENDER_TEXT_WIN_H_