diff options
author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp | |
parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp')
-rw-r--r-- | Source/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp b/Source/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp index 9234229..287121b 100644 --- a/Source/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp +++ b/Source/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp @@ -115,11 +115,15 @@ void FontPlatformData::platformDataInit(HFONT font, float size, HDC hdc, WCHAR* } FontPlatformData::FontPlatformData(HFONT hfont, CGFontRef font, float size, bool bold, bool oblique, bool useGDI) - : m_font(RefCountedGDIHandle<HFONT>::create(hfont)) + : m_syntheticBold(bold) + , m_syntheticOblique(oblique) + , m_orientation(Horizontal) + , m_textOrientation(TextOrientationVerticalRight) , m_size(size) + , m_widthVariant(RegularWidth) + , m_font(RefCountedGDIHandle<HFONT>::create(hfont)) , m_cgFont(font) - , m_syntheticBold(bold) - , m_syntheticOblique(oblique) + , m_isColorBitmapFont(false) , m_useGDI(useGDI) { } @@ -128,4 +132,27 @@ FontPlatformData::~FontPlatformData() { } +void FontPlatformData::platformDataInit(const FontPlatformData& source) +{ + m_font = source.m_font; + m_cgFont = source.m_cgFont; + m_useGDI = source.m_useGDI; +} + +const FontPlatformData& FontPlatformData::platformDataAssign(const FontPlatformData& other) +{ + m_font = other.m_font; + m_cgFont = other.m_cgFont; + m_useGDI = other.m_useGDI; + + return *this; +} + +bool FontPlatformData::platformIsEqual(const FontPlatformData& other) const +{ + return m_font == other.m_font + && m_cgFont == other.m_cgFont + && m_useGDI == other.m_useGDI; +} + } |