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

Side by Side Diff: src/core/SkFontDescriptor.h

Issue 1841123002: Reverse dependency between SkScalar.h and SkFixed.h (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Created 4 years, 8 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/core/SkFDot6.h ('k') | src/core/SkLinearBitmapPipeline_sample.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 2012 Google Inc. 2 * Copyright 2012 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 #ifndef SkFontDescriptor_DEFINED 8 #ifndef SkFontDescriptor_DEFINED
9 #define SkFontDescriptor_DEFINED 9 #define SkFontDescriptor_DEFINED
10 10
11 #include "SkFixed.h"
11 #include "SkStream.h" 12 #include "SkStream.h"
12 #include "SkString.h" 13 #include "SkString.h"
13 #include "SkTypeface.h" 14 #include "SkTypeface.h"
14 15
15 class SkFontData { 16 class SkFontData {
16 public: 17 public:
17 /** This takes ownership of 'stream'. Makes a copy of the data in 'axis'. */ 18 /** This takes ownership of 'stream'. Makes a copy of the data in 'axis'. */
18 SkFontData(SkStreamAsset* stream, int index, const SkFixed axis[], int axisC ount) 19 SkFontData(SkStreamAsset* stream, int index, const SkFixed axis[], int axisC ount)
19 : fStream(stream), fIndex(index), fAxisCount(axisCount), fAxis(axisCount ) 20 : fStream(stream), fIndex(index), fAxisCount(axisCount), fAxis(axisCount )
20 { 21 {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 private: 75 private:
75 SkString fFamilyName; 76 SkString fFamilyName;
76 SkString fFullName; 77 SkString fFullName;
77 SkString fPostscriptName; 78 SkString fPostscriptName;
78 SkAutoTDelete<SkFontData> fFontData; 79 SkAutoTDelete<SkFontData> fFontData;
79 80
80 SkTypeface::Style fStyle; 81 SkTypeface::Style fStyle;
81 }; 82 };
82 83
83 #endif // SkFontDescriptor_DEFINED 84 #endif // SkFontDescriptor_DEFINED
OLDNEW
« no previous file with comments | « src/core/SkFDot6.h ('k') | src/core/SkLinearBitmapPipeline_sample.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698