| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007 Apple Computer, Inc. | 2 * Copyright (C) 2006, 2007 Apple Computer, Inc. |
| 3 * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved. | 3 * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 void FontPlatformData::setupPaint(SkPaint* paint, float, const Font*) const | 46 void FontPlatformData::setupPaint(SkPaint* paint, float, const Font*) const |
| 47 { | 47 { |
| 48 const float ts = m_textSize >= 0 ? m_textSize : 12; | 48 const float ts = m_textSize >= 0 ? m_textSize : 12; |
| 49 paint->setTextSize(SkFloatToScalar(m_textSize)); | 49 paint->setTextSize(SkFloatToScalar(m_textSize)); |
| 50 paint->setTypeface(typeface()); | 50 paint->setTypeface(typeface()); |
| 51 paint->setFakeBoldText(m_syntheticBold); | 51 paint->setFakeBoldText(m_syntheticBold); |
| 52 paint->setTextSkewX(m_syntheticItalic ? -SK_Scalar1 / 4 : 0); | 52 paint->setTextSkewX(m_syntheticItalic ? -SK_Scalar1 / 4 : 0); |
| 53 | 53 |
| 54 uint32_t textFlags = paintTextFlags(); | 54 uint32_t textFlags = paintTextFlags(); |
| 55 uint32_t flags = paint->getFlags(); | 55 uint32_t flags = paint->getFlags(); |
| 56 static const uint32_t textFlagsMask = SkPaint::kAntiAlias_Flag | | 56 static const uint32_t textFlagsMask = SkPaint::kAntiAlias_Flag |
| 57 SkPaint::kLCDRenderText_Flag; | 57 | SkPaint::kLCDRenderText_Flag |
| 58 | SkPaint::kEmbeddedBitmapText_Flag |
| 59 | SkPaint::kSubpixelText_Flag; |
| 58 flags &= ~textFlagsMask; | 60 flags &= ~textFlagsMask; |
| 59 | 61 |
| 60 if (ts <= kMaxSizeForEmbeddedBitmap) | 62 if (ts <= kMaxSizeForEmbeddedBitmap) |
| 61 flags |= SkPaint::kEmbeddedBitmapText_Flag; | 63 flags |= SkPaint::kEmbeddedBitmapText_Flag; |
| 62 | 64 |
| 63 if (ts >= m_minSizeForAntiAlias) { | 65 if (ts >= m_minSizeForAntiAlias) { |
| 64 | 66 |
| 65 // Disable subpixel text for certain older fonts at smaller sizes as | 67 // Disable subpixel text for certain older fonts at smaller sizes as |
| 66 // they tend to get quite blurry at non-integer sizes and positions. | 68 // they tend to get quite blurry at non-integer sizes and positions. |
| 67 // For high-DPI this workaround isn't required. | 69 // For high-DPI this workaround isn't required. |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 return textFlags; | 117 return textFlags; |
| 116 } | 118 } |
| 117 | 119 |
| 118 | 120 |
| 119 void FontPlatformData::querySystemForRenderStyle() | 121 void FontPlatformData::querySystemForRenderStyle() |
| 120 { | 122 { |
| 121 m_paintTextFlags = computePaintTextFlags(fontFamilyName()); | 123 m_paintTextFlags = computePaintTextFlags(fontFamilyName()); |
| 122 } | 124 } |
| 123 | 125 |
| 124 } // namespace blink | 126 } // namespace blink |
| OLD | NEW |