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

Unified Diff: Source/platform/fonts/mac/FontMac.cpp

Issue 546973004: Revert 181541 "Merge FontPlatformDataHarfBuzz and FontPlatformData headers" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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
« no previous file with comments | « Source/platform/fonts/mac/FontCacheMac.mm ('k') | Source/platform/fonts/mac/SimpleFontDataMac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/mac/FontMac.cpp
diff --git a/Source/platform/fonts/mac/FontMac.cpp b/Source/platform/fonts/mac/FontMac.cpp
index c522c82266b9f654f1d2bb47c5613be2517e57b9..b3354fcfa6faef8d085131f42d861ee1bdd06848 100644
--- a/Source/platform/fonts/mac/FontMac.cpp
+++ b/Source/platform/fonts/mac/FontMac.cpp
@@ -52,7 +52,7 @@ bool FontPlatformFeatures::canExpandAroundIdeographsInComplexText()
static void setupPaint(SkPaint* paint, const SimpleFontData* fontData, const Font* font, bool shouldAntialias, bool shouldSmoothFonts)
{
const FontPlatformData& platformData = fontData->platformData();
- const float textSize = platformData.m_textSize >= 0 ? platformData.m_textSize : 12;
+ const float textSize = platformData.m_size >= 0 ? platformData.m_size : 12;
paint->setAntiAlias(shouldAntialias);
paint->setEmbeddedBitmapText(false);
@@ -60,7 +60,7 @@ static void setupPaint(SkPaint* paint, const SimpleFontData* fontData, const Fon
paint->setVerticalText(platformData.orientation() == Vertical);
paint->setTypeface(platformData.typeface());
paint->setFakeBoldText(platformData.m_syntheticBold);
- paint->setTextSkewX(platformData.m_syntheticItalic ? -SK_Scalar1 / 4 : 0);
+ paint->setTextSkewX(platformData.m_syntheticOblique ? -SK_Scalar1 / 4 : 0);
paint->setAutohinted(false); // freetype specific
paint->setLCDRenderText(shouldSmoothFonts);
paint->setSubpixelText(true);
« no previous file with comments | « Source/platform/fonts/mac/FontCacheMac.mm ('k') | Source/platform/fonts/mac/SimpleFontDataMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698