Show
Ignore:
Timestamp:
12/19/07 11:24:10 (12 months ago)
Author:
hyatt@apple.com
Message:

Add support for GDI text on Windows.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/platform/graphics/FontDescription.h

    r28234 r28867  
    3232const unsigned cBoldWeight = 63; 
    3333 
     34// This setting is used to provide ways of switching between multiple rendering modes that may have different 
     35// metrics.  It is used to switch between CG and GDI text on Windows. 
     36enum FontRenderingMode { NormalRenderingMode, AlternateRenderingMode }; 
     37 
    3438class FontDescription { 
    3539public: 
    … …  
    4044        : m_specifiedSize(0), m_computedSize(0),  
    4145          m_italic(false), m_smallCaps(false), m_isAbsoluteSize(false), m_weight(cNormalWeight),  
    42           m_genericFamily(NoFamily), m_usePrinterFont(false), m_keywordSize(0) 
     46          m_genericFamily(NoFamily), m_usePrinterFont(false), m_renderingMode(NormalRenderingMode), m_keywordSize(0) 
    4347          {} 
    4448     
    … …  
    5862    GenericFamilyType genericFamily() const { return static_cast<GenericFamilyType>(m_genericFamily); } 
    5963    bool usePrinterFont() const { return m_usePrinterFont; } 
     64    FontRenderingMode renderingMode() const { return static_cast<FontRenderingMode>(m_renderingMode); } 
    6065    int keywordSize() const { return m_keywordSize; } 
    6166 
    … …  
    7075    void setGenericFamily(GenericFamilyType genericFamily) { m_genericFamily = genericFamily; } 
    7176    void setUsePrinterFont(bool p) { m_usePrinterFont = p; } 
     77    void setRenderingMode(FontRenderingMode mode) { m_renderingMode = mode; } 
    7278    void setKeywordSize(int s) { m_keywordSize = s; } 
    7379 
    … …  
    8692    unsigned m_genericFamily : 3; // GenericFamilyType 
    8793    bool m_usePrinterFont : 1; 
    88      
     94 
     95    unsigned m_renderingMode : 1;  // Used to switch between CG and GDI text on Windows. 
     96 
    8997    int m_keywordSize : 4; // We cache whether or not a font is currently represented by a CSS keyword (e.g., medium).  If so, 
    9098                           // then we can accurately translate across different generic families to adjust for different preference settings 
    … …  
    103111        && m_genericFamily == other.m_genericFamily 
    104112        && m_usePrinterFont == other.m_usePrinterFont 
     113        && m_renderingMode == other.m_renderingMode 
    105114        && m_keywordSize == other.m_keywordSize; 
    106115}