| 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 16 matching lines...) Expand all Loading... |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "platform/fonts/WebFontDecoder.h" | 31 #include "platform/fonts/WebFontDecoder.h" |
| 32 | 32 |
| 33 #include "platform/Histogram.h" | 33 #include "platform/Histogram.h" |
| 34 #include "platform/SharedBuffer.h" | 34 #include "platform/SharedBuffer.h" |
| 35 #include "platform/TraceEvent.h" | 35 #include "platform/TraceEvent.h" |
| 36 #include "platform/fonts/FontCache.h" | 36 #include "platform/fonts/FontCache.h" |
| 37 #include "platform/graphics/skia/SkiaUtils.h" |
| 37 #include "public/platform/Platform.h" | 38 #include "public/platform/Platform.h" |
| 38 #include "third_party/harfbuzz-ng/src/hb.h" | 39 #include "third_party/harfbuzz-ng/src/hb.h" |
| 39 #include "third_party/ots/include/ots-memory-stream.h" | 40 #include "third_party/ots/include/ots-memory-stream.h" |
| 40 #include "third_party/skia/include/core/SkStream.h" | 41 #include "third_party/skia/include/core/SkStream.h" |
| 41 #include "wtf/CurrentTime.h" | 42 #include "wtf/CurrentTime.h" |
| 42 | 43 |
| 43 #include <stdarg.h> | 44 #include <stdarg.h> |
| 44 | 45 |
| 45 namespace blink { | 46 namespace blink { |
| 46 | 47 |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 } | 185 } |
| 185 | 186 |
| 186 const size_t decodedLength = output.Tell(); | 187 const size_t decodedLength = output.Tell(); |
| 187 recordDecodeSpeedHistogram(data, buffer->size(), currentTime() - start, deco
dedLength); | 188 recordDecodeSpeedHistogram(data, buffer->size(), currentTime() - start, deco
dedLength); |
| 188 | 189 |
| 189 sk_sp<SkData> skData = SkData::MakeWithCopy(output.get(), decodedLength); | 190 sk_sp<SkData> skData = SkData::MakeWithCopy(output.get(), decodedLength); |
| 190 SkMemoryStream* stream = new SkMemoryStream(skData); | 191 SkMemoryStream* stream = new SkMemoryStream(skData); |
| 191 #if OS(WIN) | 192 #if OS(WIN) |
| 192 RefPtr<SkTypeface> typeface = adoptRef(FontCache::fontCache()->fontManager()
->createFromStream(stream)); | 193 RefPtr<SkTypeface> typeface = adoptRef(FontCache::fontCache()->fontManager()
->createFromStream(stream)); |
| 193 #else | 194 #else |
| 194 RefPtr<SkTypeface> typeface = adoptRef(SkTypeface::CreateFromStream(stream))
; | 195 RefPtr<SkTypeface> typeface = fromSkSp(SkTypeface::MakeFromStream(stream)); |
| 195 #endif | 196 #endif |
| 196 if (!typeface) { | 197 if (!typeface) { |
| 197 setErrorString("Not a valid font data"); | 198 setErrorString("Not a valid font data"); |
| 198 return nullptr; | 199 return nullptr; |
| 199 } | 200 } |
| 200 | 201 |
| 201 return typeface.release(); | 202 return typeface.release(); |
| 202 } | 203 } |
| 203 | 204 |
| 204 } // namespace blink | 205 } // namespace blink |
| OLD | NEW |