| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2014 Google Inc. | 2 * Copyright 2014 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "SkDWrite.h" | 8 #include "SkDWrite.h" |
| 9 #include "SkDWriteFontFileStream.h" | 9 #include "SkDWriteFontFileStream.h" |
| 10 #include "SkFontMgr.h" | 10 #include "SkFontMgr.h" |
| 11 #include "SkHRESULT.h" | 11 #include "SkHRESULT.h" |
| 12 #include "SkMutex.h" | |
| 13 #include "SkStream.h" | 12 #include "SkStream.h" |
| 14 #include "SkTScopedComPtr.h" | 13 #include "SkTScopedComPtr.h" |
| 14 #include "SkThread.h" |
| 15 #include "SkTypeface.h" | 15 #include "SkTypeface.h" |
| 16 #include "SkTypefaceCache.h" | 16 #include "SkTypefaceCache.h" |
| 17 #include "SkTypeface_win_dw.h" | 17 #include "SkTypeface_win_dw.h" |
| 18 #include "SkTypes.h" | 18 #include "SkTypes.h" |
| 19 #include "SkUtils.h" | 19 #include "SkUtils.h" |
| 20 | 20 |
| 21 #include <dwrite.h> | 21 #include <dwrite.h> |
| 22 | 22 |
| 23 #if SK_HAS_DWRITE_2_H | 23 #if SK_HAS_DWRITE_2_H |
| 24 #include <dwrite_2.h> | 24 #include <dwrite_2.h> |
| (...skipping 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1097 } | 1097 } |
| 1098 | 1098 |
| 1099 #include "SkFontMgr_indirect.h" | 1099 #include "SkFontMgr_indirect.h" |
| 1100 SK_API SkFontMgr* SkFontMgr_New_DirectWriteRenderer(SkRemotableFontMgr* proxy) { | 1100 SK_API SkFontMgr* SkFontMgr_New_DirectWriteRenderer(SkRemotableFontMgr* proxy) { |
| 1101 SkAutoTUnref<SkFontMgr> impl(SkFontMgr_New_DirectWrite()); | 1101 SkAutoTUnref<SkFontMgr> impl(SkFontMgr_New_DirectWrite()); |
| 1102 if (impl.get() == NULL) { | 1102 if (impl.get() == NULL) { |
| 1103 return NULL; | 1103 return NULL; |
| 1104 } | 1104 } |
| 1105 return SkNEW_ARGS(SkFontMgr_Indirect, (impl.get(), proxy)); | 1105 return SkNEW_ARGS(SkFontMgr_Indirect, (impl.get(), proxy)); |
| 1106 } | 1106 } |
| OLD | NEW |