Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: src/ports/SkFontHost_FreeType.cpp

Issue 1214603003: Revert of Remove SkThread.h, include SkMutex.h or SkAtomics.h as appropriate. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/ports/SkFontConfigInterface_direct.cpp ('k') | src/ports/SkFontHost_FreeType_common.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
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 "SkAdvancedTypefaceMetrics.h" 8 #include "SkAdvancedTypefaceMetrics.h"
9 #include "SkBitmap.h" 9 #include "SkBitmap.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
11 #include "SkColorPriv.h" 11 #include "SkColorPriv.h"
12 #include "SkDescriptor.h" 12 #include "SkDescriptor.h"
13 #include "SkFDot6.h" 13 #include "SkFDot6.h"
14 #include "SkFontDescriptor.h" 14 #include "SkFontDescriptor.h"
15 #include "SkFontHost_FreeType_common.h" 15 #include "SkFontHost_FreeType_common.h"
16 #include "SkGlyph.h" 16 #include "SkGlyph.h"
17 #include "SkMask.h" 17 #include "SkMask.h"
18 #include "SkMaskGamma.h" 18 #include "SkMaskGamma.h"
19 #include "SkMatrix22.h" 19 #include "SkMatrix22.h"
20 #include "SkMutex.h"
21 #include "SkOTUtils.h" 20 #include "SkOTUtils.h"
22 #include "SkScalerContext.h" 21 #include "SkScalerContext.h"
23 #include "SkStream.h" 22 #include "SkStream.h"
24 #include "SkString.h" 23 #include "SkString.h"
25 #include "SkTemplates.h" 24 #include "SkTemplates.h"
25 #include "SkThread.h"
26 #include "SkTypes.h" 26 #include "SkTypes.h"
27 27
28 #if defined(SK_CAN_USE_DLOPEN) 28 #if defined(SK_CAN_USE_DLOPEN)
29 #include <dlfcn.h> 29 #include <dlfcn.h>
30 #endif 30 #endif
31 #include <ft2build.h> 31 #include <ft2build.h>
32 #include FT_ADVANCES_H 32 #include FT_ADVANCES_H
33 #include FT_BITMAP_H 33 #include FT_BITMAP_H
34 #include FT_FREETYPE_H 34 #include FT_FREETYPE_H
35 #include FT_LCD_FILTER_H 35 #include FT_LCD_FILTER_H
(...skipping 1695 matching lines...) Expand 10 before | Expand all | Expand 10 after
1731 (*axes)[i].fTag = ftAxis.tag; 1731 (*axes)[i].fTag = ftAxis.tag;
1732 (*axes)[i].fMinimum = ftAxis.minimum; 1732 (*axes)[i].fMinimum = ftAxis.minimum;
1733 (*axes)[i].fDefault = ftAxis.def; 1733 (*axes)[i].fDefault = ftAxis.def;
1734 (*axes)[i].fMaximum = ftAxis.maximum; 1734 (*axes)[i].fMaximum = ftAxis.maximum;
1735 } 1735 }
1736 } 1736 }
1737 1737
1738 FT_Done_Face(face); 1738 FT_Done_Face(face);
1739 return true; 1739 return true;
1740 } 1740 }
OLDNEW
« no previous file with comments | « src/ports/SkFontConfigInterface_direct.cpp ('k') | src/ports/SkFontHost_FreeType_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698