| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 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 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 sk_sp<SkTypeface> typeface( | 203 sk_sp<SkTypeface> typeface( |
| 204 FontCache::fontCache()->fontManager()->createFromStream(stream)); | 204 FontCache::fontCache()->fontManager()->createFromStream(stream)); |
| 205 #else | 205 #else |
| 206 sk_sp<SkTypeface> typeface = SkTypeface::MakeFromStream(stream); | 206 sk_sp<SkTypeface> typeface = SkTypeface::MakeFromStream(stream); |
| 207 #endif | 207 #endif |
| 208 if (!typeface) { | 208 if (!typeface) { |
| 209 setErrorString("Not a valid font data"); | 209 setErrorString("Not a valid font data"); |
| 210 return nullptr; | 210 return nullptr; |
| 211 } | 211 } |
| 212 | 212 |
| 213 m_decodedSize = decodedLength; |
| 213 return typeface; | 214 return typeface; |
| 214 } | 215 } |
| 215 | 216 |
| 216 } // namespace blink | 217 } // namespace blink |
| OLD | NEW |