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

Unified Diff: Source/core/platform/graphics/skia/FontCacheSkia.cpp

Issue 26272006: Fix Skia FontCache platform data construction to use right font size (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 2 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 | « LayoutTests/platform/linux/fast/forms/placeholder-position-expected.png ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/graphics/skia/FontCacheSkia.cpp
diff --git a/Source/core/platform/graphics/skia/FontCacheSkia.cpp b/Source/core/platform/graphics/skia/FontCacheSkia.cpp
index 34cdcc2caabc5b8c730078826adda3fee0827b65..926e8b267292387baf06e5194051cc10be4cc556 100644
--- a/Source/core/platform/graphics/skia/FontCacheSkia.cpp
+++ b/Source/core/platform/graphics/skia/FontCacheSkia.cpp
@@ -30,6 +30,7 @@
#include "config.h"
+#include "RuntimeEnabledFeatures.h"
#include "SkFontMgr.h"
#include "SkTypeface.h"
#include "platform/NotImplemented.h"
@@ -167,7 +168,9 @@ FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontD
FontPlatformData* result = new FontPlatformData(tf,
name.data(),
- fontDescription.computedSize(),
+ (RuntimeEnabledFeatures::subpixelFontScalingEnabled())
+ ? fontDescription.computedSize()
+ : fontDescription.computedPixelSize(),
fontDescription.weight() >= FontWeightBold && !tf->isBold(),
fontDescription.italic() && !tf->isItalic(),
fontDescription.orientation());
« no previous file with comments | « LayoutTests/platform/linux/fast/forms/placeholder-position-expected.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698