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

Side by Side Diff: src/ports/SkFontHost_FreeType_common.h

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/SkFontHost_FreeType.cpp ('k') | src/ports/SkFontHost_mac.cpp » ('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-2012 The Android Open Source Project 2 * Copyright 2006-2012 The Android Open Source Project
3 * Copyright 2012 Mozilla Foundation 3 * Copyright 2012 Mozilla Foundation
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 #ifndef SKFONTHOST_FREETYPE_COMMON_H_ 9 #ifndef SKFONTHOST_FREETYPE_COMMON_H_
10 #define SKFONTHOST_FREETYPE_COMMON_H_ 10 #define SKFONTHOST_FREETYPE_COMMON_H_
11 11
12 #include "SkGlyph.h" 12 #include "SkGlyph.h"
13 #include "SkMutex.h"
14 #include "SkScalerContext.h" 13 #include "SkScalerContext.h"
15 #include "SkTypeface.h" 14 #include "SkTypeface.h"
16 #include "SkTypes.h" 15 #include "SkTypes.h"
17 16
18 #include <ft2build.h> 17 #include <ft2build.h>
19 #include FT_FREETYPE_H 18 #include FT_FREETYPE_H
20 19
21 class SkScalerContext_FreeType_Base : public SkScalerContext { 20 class SkScalerContext_FreeType_Base : public SkScalerContext {
22 protected: 21 protected:
23 // See http://freetype.sourceforge.net/freetype2/docs/reference/ft2-bitmap_h andling.html#FT_Bitmap_Embolden 22 // See http://freetype.sourceforge.net/freetype2/docs/reference/ft2-bitmap_h andling.html#FT_Bitmap_Embolden
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 virtual size_t onGetTableData(SkFontTableTag, size_t offset, 84 virtual size_t onGetTableData(SkFontTableTag, size_t offset,
86 size_t length, void* data) const override; 85 size_t length, void* data) const override;
87 86
88 private: 87 private:
89 mutable int fGlyphCount; 88 mutable int fGlyphCount;
90 89
91 typedef SkTypeface INHERITED; 90 typedef SkTypeface INHERITED;
92 }; 91 };
93 92
94 #endif // SKFONTHOST_FREETYPE_COMMON_H_ 93 #endif // SKFONTHOST_FREETYPE_COMMON_H_
OLDNEW
« no previous file with comments | « src/ports/SkFontHost_FreeType.cpp ('k') | src/ports/SkFontHost_mac.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698