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/core/SkAdvancedTypefaceMetrics.cpp

Issue 98703002: Fix compilation with SK_ENABLE_INST_COUNT=1 (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years 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 | Annotate | Revision Log
« no previous file with comments | « samplecode/SampleApp.cpp ('k') | src/core/SkBBoxHierarchy.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 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
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 #include "SkAdvancedTypefaceMetrics.h" 10 #include "SkAdvancedTypefaceMetrics.h"
11 #include "SkTypes.h" 11 #include "SkTypes.h"
12 12
13 SK_DEFINE_INST_COUNT(SkAdvancedTypefaceMetrics)
14
15 #if defined(SK_BUILD_FOR_WIN) 13 #if defined(SK_BUILD_FOR_WIN)
16 #include <dwrite.h> 14 #include <dwrite.h>
17 #endif 15 #endif
18 16
19 #if defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID) 17 #if defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID)
20 // forward declare structs needed for getAdvanceData() template for freetype 18 // forward declare structs needed for getAdvanceData() template for freetype
21 struct FT_FaceRec; 19 struct FT_FaceRec;
22 typedef struct FT_FaceRec_* FT_Face; 20 typedef struct FT_FaceRec_* FT_Face;
23 #endif 21 #endif
24 22
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 306
309 // additional declaration needed for testing with a face of an unknown type 307 // additional declaration needed for testing with a face of an unknown type
310 template SkAdvancedTypefaceMetrics::WidthRange* getAdvanceData( 308 template SkAdvancedTypefaceMetrics::WidthRange* getAdvanceData(
311 void* fontData, 309 void* fontData,
312 int num_glyphs, 310 int num_glyphs,
313 const uint32_t* subsetGlyphIDs, 311 const uint32_t* subsetGlyphIDs,
314 uint32_t subsetGlyphIDsLength, 312 uint32_t subsetGlyphIDsLength,
315 bool (*getAdvance)(void* fontData, int gId, int16_t* data)); 313 bool (*getAdvance)(void* fontData, int gId, int16_t* data));
316 314
317 } // namespace skia_advanced_typeface_metrics_utils 315 } // namespace skia_advanced_typeface_metrics_utils
OLDNEW
« no previous file with comments | « samplecode/SampleApp.cpp ('k') | src/core/SkBBoxHierarchy.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698