Revert 116945 - Enable bold and italic text styles in RenderText*.

To do this, the following changes were made:

Added functions GetStyle() and DeriveFontList(style) to FontList. Changed font list to use strings "Bold" and "Italic" instead of PANGO_STYLE_ITALIC and PANGO_WEIGHT_BOLD - where were actually compile constants for setting attributes and weren't recognized by Pango in a font string. (Whereas "Bold" and "Italic" are recognized).

Add RenderText test that checks that the width of a bold string > the width of a non-bold string.
Add FontList tests for the new functions.

BUG=107893
TEST=Run views_examples_exe "Text Styles" examples and try bold and italic styles (this depends on an unreleased CL). Also, new tests in FontListTest and RenderTextTest.

Review URL: http://codereview.chromium.org/8963027

TBR=asvitkine@chromium.org
Review URL: http://codereview.chromium.org/9147016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116948 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 3 deletions

diff --git a/ui/gfx/render_text.h b/ui/gfx/render_text.h
index 217f846..2a69ed0 100644
--- a/ui/gfx/render_text.h
+++ b/ui/gfx/render_text.h
@@ -39,13 +39,13 @@ class SkiaTextRenderer {
   void SetTypeface(SkTypeface* typeface);
   void SetTextSize(int size);
   void SetFont(const gfx::Font& font);
-  void SetFontStyle(int font_style);
   void SetForegroundColor(SkColor foreground);
   void DrawSelection(const std::vector<Rect>& selection, SkColor color);
   void DrawPosText(const SkPoint* pos,
                    const uint16* glyphs,
                    size_t glyph_count);
   void DrawDecorations(int x, int y, int width, bool underline, bool strike);
+  void DrawCursor(const gfx::Rect& bounds);
 
  private:
   SkCanvas* canvas_skia_;
@@ -70,9 +70,12 @@ const SkColor kCursorColor = SK_ColorBLACK;
 struct UI_EXPORT StyleRange {
   StyleRange();
 
+  // TODO(asvitkine): Add RenderText support for font weight. Add a |bold| style
+  // flag here, to be handled in RenderText's layout phase. For example, in
+  // RenderTextLinux, generate the new font description with font weight style
+  // option, create a Pango attribute from it, and append the attribute to
+  // layout.
   SkColor foreground;
-  // A gfx::Font::FontStyle flag to specify bold and italic styles.
-  int font_style;
   bool strike;
   bool underline;
   ui::Range range;