Replace StyleRange with BreakList; update RenderText, etc.

ui/gfx/font.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_FONT_H_
 #define UI_GFX_FONT_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "ui/base/ui_export.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
 
 class PlatformFont;
 
 // Font provides a wrapper around an underlying font. Copy and assignment
 // operators are explicitly allowed, and cheap.
 class UI_EXPORT Font {
  public:
   // The following constants indicate the font style.
   enum FontStyle {
     NORMAL = 0,
     BOLD = 1,
     ITALIC = 2,
-    UNDERLINED = 4,
+    UNDERLINE = 4,
   };
 
   // Creates a font with the default name and style.
   Font();
 
   // Creates a font that is a clone of another font object.
   Font(const Font& other);
   gfx::Font& operator=(const Font& other);
 
   // Creates a font from the specified native font.
@@ skipping 10 matching lines @@
 
   // Returns a new Font derived from the existing font.
   // |size_deta| is the size in pixels to add to the current font. For example,
   // a value of 5 results in a font 5 pixels bigger than this font.
   Font DeriveFont(int size_delta) const;
 
   // Returns a new Font derived from the existing font.
   // |size_delta| is the size in pixels to add to the current font. See the
   // single argument version of this method for an example.
   // The style parameter specifies the new style for the font, and is a
-  // bitmask of the values: BOLD, ITALIC and UNDERLINED.
+  // bitmask of the values: BOLD, ITALIC and UNDERLINE.
   Font DeriveFont(int size_delta, int style) const;
 
   // Returns the number of vertical pixels needed to display characters from
   // the specified font.  This may include some leading, i.e. height may be
   // greater than just ascent + descent.  Specifically, the Windows and Mac
   // implementations include leading and the Linux one does not.  This may
   // need to be revisited in the future.
   int GetHeight() const;
 
   // Returns the baseline, or ascent, of the font.
@@ skipping 35 matching lines @@
   PlatformFont* platform_font() const { return platform_font_.get(); }
 
  private:
   // Wrapped platform font implementation.
   scoped_refptr<PlatformFont> platform_font_;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_FONT_H_