| OLD | NEW | 
|    1 /* |    1 /* | 
|    2  * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |    2  * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 
|    3  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
      All rights reserved. |    3  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
      All rights reserved. | 
|    4  * Copyright (C) 2013 Google Inc. All rights reserved. |    4  * Copyright (C) 2013 Google Inc. All rights reserved. | 
|    5  * |    5  * | 
|    6  * This library is free software; you can redistribute it and/or |    6  * This library is free software; you can redistribute it and/or | 
|    7  * modify it under the terms of the GNU Library General Public |    7  * modify it under the terms of the GNU Library General Public | 
|    8  * License as published by the Free Software Foundation; either |    8  * License as published by the Free Software Foundation; either | 
|    9  * version 2 of the License, or (at your option) any later version. |    9  * version 2 of the License, or (at your option) any later version. | 
|   10  * |   10  * | 
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   54     AtomicString genericFontFamilyName(FontDescription::GenericFamilyType) const
     ; |   54     AtomicString genericFontFamilyName(FontDescription::GenericFamilyType) const
     ; | 
|   55  |   55  | 
|   56     float fontSizeForKeyword(unsigned keyword, bool isMonospace) const; |   56     float fontSizeForKeyword(unsigned keyword, bool isMonospace) const; | 
|   57  |   57  | 
|   58     void setWeight(FontWeight); |   58     void setWeight(FontWeight); | 
|   59     void setSize(const FontDescription::Size&); |   59     void setSize(const FontDescription::Size&); | 
|   60     void setSizeAdjust(const float aspectValue); |   60     void setSizeAdjust(const float aspectValue); | 
|   61     void setStretch(FontStretch); |   61     void setStretch(FontStretch); | 
|   62     void setFamilyDescription(const FontDescription::FamilyDescription&); |   62     void setFamilyDescription(const FontDescription::FamilyDescription&); | 
|   63     void setFeatureSettings(PassRefPtr<FontFeatureSettings>); |   63     void setFeatureSettings(PassRefPtr<FontFeatureSettings>); | 
|   64     void setLocale(const AtomicString&); |   64     void setLocale(PassRefPtr<const LayoutLocale>); | 
|   65     void setStyle(FontStyle); |   65     void setStyle(FontStyle); | 
|   66     void setVariantCaps(FontDescription::FontVariantCaps); |   66     void setVariantCaps(FontDescription::FontVariantCaps); | 
|   67     void setVariantLigatures(const FontDescription::VariantLigatures&); |   67     void setVariantLigatures(const FontDescription::VariantLigatures&); | 
|   68     void setVariantNumeric(const FontVariantNumeric&); |   68     void setVariantNumeric(const FontVariantNumeric&); | 
|   69     void setTextRendering(TextRenderingMode); |   69     void setTextRendering(TextRenderingMode); | 
|   70     void setKerning(FontDescription::Kerning); |   70     void setKerning(FontDescription::Kerning); | 
|   71     void setFontSmoothing(FontSmoothingMode); |   71     void setFontSmoothing(FontSmoothingMode); | 
|   72  |   72  | 
|   73     // FIXME: These need to just vend a Font object eventually. |   73     // FIXME: These need to just vend a Font object eventually. | 
|   74     void createFont(FontSelector*, ComputedStyle&); |   74     void createFont(FontSelector*, ComputedStyle&); | 
|   75  |   75  | 
|   76     void createFontForDocument(FontSelector*, ComputedStyle&); |   76     void createFontForDocument(FontSelector*, ComputedStyle&); | 
|   77  |   77  | 
|   78     bool fontDirty() const { return m_flags; } |   78     bool fontDirty() const { return m_flags; } | 
|   79  |   79  | 
|   80     static FontDescription::FamilyDescription initialFamilyDescription() { retur
     n FontDescription::FamilyDescription(initialGenericFamily()); } |   80     static FontDescription::FamilyDescription initialFamilyDescription() { retur
     n FontDescription::FamilyDescription(initialGenericFamily()); } | 
|   81     static FontFeatureSettings* initialFeatureSettings() { return nullptr; } |   81     static FontFeatureSettings* initialFeatureSettings() { return nullptr; } | 
|   82     static FontDescription::GenericFamilyType initialGenericFamily() { return Fo
     ntDescription::StandardFamily; } |   82     static FontDescription::GenericFamilyType initialGenericFamily() { return Fo
     ntDescription::StandardFamily; } | 
|   83     static FontDescription::Size initialSize() { return FontDescription::Size(Fo
     ntSize::initialKeywordSize(), 0.0f, false); } |   83     static FontDescription::Size initialSize() { return FontDescription::Size(Fo
     ntSize::initialKeywordSize(), 0.0f, false); } | 
|   84     static float initialSizeAdjust() { return FontSizeAdjustNone; } |   84     static float initialSizeAdjust() { return FontSizeAdjustNone; } | 
|   85     static TextRenderingMode initialTextRendering() { return AutoTextRendering; 
     } |   85     static TextRenderingMode initialTextRendering() { return AutoTextRendering; 
     } | 
|   86     static FontDescription::FontVariantCaps initialVariantCaps() { return FontDe
     scription::CapsNormal; } |   86     static FontDescription::FontVariantCaps initialVariantCaps() { return FontDe
     scription::CapsNormal; } | 
|   87     static FontDescription::VariantLigatures initialVariantLigatures() { return 
     FontDescription::VariantLigatures(); } |   87     static FontDescription::VariantLigatures initialVariantLigatures() { return 
     FontDescription::VariantLigatures(); } | 
|   88     static FontVariantNumeric initialVariantNumeric() { return FontVariantNumeri
     c(); }; |   88     static FontVariantNumeric initialVariantNumeric() { return FontVariantNumeri
     c(); }; | 
|   89     static const AtomicString& initialLocale() { return nullAtom; } |   89     static LayoutLocale* initialLocale() { return nullptr; } | 
|   90     static FontStyle initialStyle() { return FontStyleNormal; } |   90     static FontStyle initialStyle() { return FontStyleNormal; } | 
|   91     static FontDescription::Kerning initialKerning() { return FontDescription::A
     utoKerning; } |   91     static FontDescription::Kerning initialKerning() { return FontDescription::A
     utoKerning; } | 
|   92     static FontSmoothingMode initialFontSmoothing() { return AutoSmoothing; } |   92     static FontSmoothingMode initialFontSmoothing() { return AutoSmoothing; } | 
|   93     static FontStretch initialStretch() { return FontStretchNormal; } |   93     static FontStretch initialStretch() { return FontStretchNormal; } | 
|   94     static FontWeight initialWeight() { return FontWeightNormal; } |   94     static FontWeight initialWeight() { return FontWeightNormal; } | 
|   95  |   95  | 
|   96 private: |   96 private: | 
|   97  |   97  | 
|   98     void setFamilyDescription(FontDescription&, const FontDescription::FamilyDes
     cription&); |   98     void setFamilyDescription(FontDescription&, const FontDescription::FamilyDes
     cription&); | 
|   99     void setSize(FontDescription&, const FontDescription::Size&); |   99     void setSize(FontDescription&, const FontDescription::Size&); | 
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  132  |  132  | 
|  133     void set(PropertySetFlag flag) { m_flags |= (1 << unsigned(flag)); } |  133     void set(PropertySetFlag flag) { m_flags |= (1 << unsigned(flag)); } | 
|  134     bool isSet(PropertySetFlag flag) const { return m_flags & (1 << unsigned(fla
     g)); } |  134     bool isSet(PropertySetFlag flag) const { return m_flags & (1 << unsigned(fla
     g)); } | 
|  135  |  135  | 
|  136     unsigned m_flags; |  136     unsigned m_flags; | 
|  137 }; |  137 }; | 
|  138  |  138  | 
|  139 } // namespace blink |  139 } // namespace blink | 
|  140  |  140  | 
|  141 #endif |  141 #endif | 
| OLD | NEW |