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

Side by Side Diff: include/core/SkTypeface.h

Issue 1290733002: Revert[3] "move some public headers into private" (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 4 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 | « include/core/SkScalar.h ('k') | include/core/SkWeakRefCnt.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 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
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 9
10 #ifndef SkTypeface_DEFINED 10 #ifndef SkTypeface_DEFINED
11 #define SkTypeface_DEFINED 11 #define SkTypeface_DEFINED
12 12
13 #include "SkFontStyle.h" 13 #include "SkFontStyle.h"
14 #include "SkLazyPtr.h" 14 #include "SkLazyPtr.h"
15 #include "SkRect.h" 15 #include "SkRect.h"
16 #include "SkString.h" 16 #include "SkString.h"
17 #include "../private/SkWeakRefCnt.h" 17 #include "SkWeakRefCnt.h"
18 18
19 class SkDescriptor; 19 class SkDescriptor;
20 class SkFontData; 20 class SkFontData;
21 class SkFontDescriptor; 21 class SkFontDescriptor;
22 class SkScalerContext; 22 class SkScalerContext;
23 struct SkScalerContextRec; 23 struct SkScalerContextRec;
24 class SkStream; 24 class SkStream;
25 class SkStreamAsset; 25 class SkStreamAsset;
26 class SkAdvancedTypefaceMetrics; 26 class SkAdvancedTypefaceMetrics;
27 class SkWStream; 27 class SkWStream;
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 SkFontStyle fStyle; 410 SkFontStyle fStyle;
411 bool fIsFixedPitch; 411 bool fIsFixedPitch;
412 412
413 friend class SkPaint; 413 friend class SkPaint;
414 friend class SkGlyphCache; // GetDefaultTypeface 414 friend class SkGlyphCache; // GetDefaultTypeface
415 415
416 typedef SkWeakRefCnt INHERITED; 416 typedef SkWeakRefCnt INHERITED;
417 }; 417 };
418 418
419 #endif 419 #endif
OLDNEW
« no previous file with comments | « include/core/SkScalar.h ('k') | include/core/SkWeakRefCnt.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698