diff options
| author | Derek Sollenberger <djsollen@google.com> | 2012-01-04 11:04:30 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-04 11:04:30 -0800 |
| commit | aeaf68066c6d19936e9f541250225f1303418ccd (patch) | |
| tree | 17b06c8a83afbb21f51f05c347a56c3fea9b3c39 | |
| parent | 68923fdc71f84fdc481ff2e570f0bad7d508fd95 (diff) | |
| parent | 913b1b6014716289bbab8319aae36dffa8bd6f88 (diff) | |
| download | external_webkit-aeaf68066c6d19936e9f541250225f1303418ccd.zip external_webkit-aeaf68066c6d19936e9f541250225f1303418ccd.tar.gz external_webkit-aeaf68066c6d19936e9f541250225f1303418ccd.tar.bz2 | |
Merge "Allow 0 pt fonts in SkPaint."
| -rw-r--r-- | Source/WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp b/Source/WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp index e4fa435..fc254c0 100644 --- a/Source/WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp @@ -198,10 +198,6 @@ FontPlatformData& FontPlatformData::operator=(const FontPlatformData& src) void FontPlatformData::setupPaint(SkPaint* paint) const { - float ts = mTextSize; - if (!(ts > 0)) - ts = 12; - if (hashTableDeletedFontValue() == mTypeface) paint->setTypeface(0); else @@ -210,7 +206,7 @@ void FontPlatformData::setupPaint(SkPaint* paint) const paint->setAntiAlias(true); paint->setSubpixelText(true); paint->setHinting(SkPaint::kSlight_Hinting); - paint->setTextSize(SkFloatToScalar(ts)); + paint->setTextSize(SkFloatToScalar(mTextSize)); paint->setFakeBoldText(mFakeBold); paint->setTextSkewX(mFakeItalic ? -SK_Scalar1/4 : 0); #ifndef SUPPORT_COMPLEX_SCRIPTS |