| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2006, 2007, 2008, 2009 Google Inc. All rights reserved. | 2 * Copyright (c) 2006, 2007, 2008, 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 CString name; | 212 CString name; |
| 213 RefPtr<SkTypeface> tf(createTypeface(fontDescription, creationParams, name))
; | 213 RefPtr<SkTypeface> tf(createTypeface(fontDescription, creationParams, name))
; |
| 214 if (!tf) | 214 if (!tf) |
| 215 return nullptr; | 215 return nullptr; |
| 216 | 216 |
| 217 return adoptPtr(new FontPlatformData(tf, | 217 return adoptPtr(new FontPlatformData(tf, |
| 218 name.data(), | 218 name.data(), |
| 219 fontSize, | 219 fontSize, |
| 220 (fontDescription.weight() >= FontWeight600 && !tf->isBold()) || fontDesc
ription.isSyntheticBold(), | 220 (fontDescription.weight() >= FontWeight600 && !tf->isBold()) || fontDesc
ription.isSyntheticBold(), |
| 221 ((fontDescription.style() == FontStyleItalic || fontDescription.style()
== FontStyleOblique) && !tf->isItalic()) || fontDescription.isSyntheticItalic(), | 221 ((fontDescription.style() == FontStyleItalic || fontDescription.style()
== FontStyleOblique) && !tf->isItalic()) || fontDescription.isSyntheticItalic(), |
| 222 fontDescription.orientation(), | 222 fontDescription.orientation())); |
| 223 fontDescription.useSubpixelPositioning())); | |
| 224 } | 223 } |
| 225 #endif // !OS(WIN) | 224 #endif // !OS(WIN) |
| 226 | 225 |
| 227 } // namespace blink | 226 } // namespace blink |
| OLD | NEW |