Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(522)

Unified Diff: Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp

Issue 21353004: Use Skia for font selection on windows (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp
diff --git a/Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp b/Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp
index 91a37d31ddbe24f504aab22c2152651adc733de1..ef95574f1f1821759055fb4dd033dcbeb210c257 100644
--- a/Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp
+++ b/Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp
@@ -53,7 +53,7 @@ void FontPlatformData::setupPaint(SkPaint* paint) const
{
const float ts = m_size >= 0 ? m_size : 12;
paint->setTextSize(SkFloatToScalar(m_size));
- paint->setTypeface(m_typeface);
+ paint->setTypeface(typeface());
}
#endif
@@ -154,6 +154,7 @@ FontPlatformData::FontPlatformData(float size, bool bold, bool oblique)
, m_size(size)
, m_orientation(Horizontal)
, m_scriptCache(0)
+ , m_typeface(0)
, m_paintTextFlags(0)
, m_isHashTableDeletedValue(false)
{
@@ -181,6 +182,25 @@ FontPlatformData::FontPlatformData(const FontPlatformData& data, float textSize)
{
}
+FontPlatformData::FontPlatformData(SkTypeface* tf, const char* family, float textSize, bool fakeBold, bool fakeItalic, FontOrientation orientation)
+ : m_font(0)
+ , m_size(textSize)
+ , m_orientation(orientation)
+ , m_scriptCache(0)
+ , m_typeface(tf)
+ , m_isHashTableDeletedValue(false)
+{
+ // FIXME: This can be removed together with m_font once the last few
+ // uses of hfont() has been eliminated.
+ LOGFONT logFont;
+ SkLOGFONTFromTypeface(tf, &logFont);
+ logFont.lfHeight = -textSize;
+ HFONT hFont = CreateFontIndirect(&logFont);
+ if (hFont)
+ m_font = RefCountedHFONT::create(hFont);
+ m_paintTextFlags = computePaintTextFlags(logFont);
+}
+
FontPlatformData& FontPlatformData::operator=(const FontPlatformData& data)
{
if (this != &data) {
@@ -230,7 +250,7 @@ bool FontPlatformData::isFixedPitch() const
return treatAsFixedPitch;
#else
- return typeface()->isFixedPitch();
+ return typeface() && typeface()->isFixedPitch();
#endif
}

Powered by Google App Engine
This is Rietveld 408576698