| 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 // if available. | 43 // if available. |
| 44 const float kMaxSizeForEmbeddedBitmap = 24.0f; | 44 const float kMaxSizeForEmbeddedBitmap = 24.0f; |
| 45 | 45 |
| 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 paint->setLinearText(true); |
| 53 | 54 |
| 54 uint32_t textFlags = paintTextFlags(); | 55 uint32_t textFlags = paintTextFlags(); |
| 55 uint32_t flags = paint->getFlags(); | 56 uint32_t flags = paint->getFlags(); |
| 56 static const uint32_t textFlagsMask = SkPaint::kAntiAlias_Flag | 57 static const uint32_t textFlagsMask = SkPaint::kAntiAlias_Flag |
| 57 | SkPaint::kLCDRenderText_Flag | 58 | SkPaint::kLCDRenderText_Flag |
| 58 | SkPaint::kEmbeddedBitmapText_Flag | 59 | SkPaint::kEmbeddedBitmapText_Flag |
| 59 | SkPaint::kSubpixelText_Flag; | 60 | SkPaint::kSubpixelText_Flag; |
| 60 flags &= ~textFlagsMask; | 61 flags &= ~textFlagsMask; |
| 61 | 62 |
| 62 if (ts <= kMaxSizeForEmbeddedBitmap) | 63 if (ts <= kMaxSizeForEmbeddedBitmap) |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 return textFlags; | 118 return textFlags; |
| 118 } | 119 } |
| 119 | 120 |
| 120 | 121 |
| 121 void FontPlatformData::querySystemForRenderStyle() | 122 void FontPlatformData::querySystemForRenderStyle() |
| 122 { | 123 { |
| 123 m_paintTextFlags = computePaintTextFlags(fontFamilyName()); | 124 m_paintTextFlags = computePaintTextFlags(fontFamilyName()); |
| 124 } | 125 } |
| 125 | 126 |
| 126 } // namespace blink | 127 } // namespace blink |
| OLD | NEW |