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

Side by Side Diff: src/ports/SkFontConfigInterface_android.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
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2013 The Android Open Source Project 3 * Copyright 2013 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 #include "SkFontConfigInterface.h" 9 #include "SkFontConfigInterface.h"
10 #include "SkTypeface_android.h" 10 #include "SkTypeface_android.h"
(...skipping 17 matching lines...) Expand all
28 #ifndef SK_DEBUG_FONTS 28 #ifndef SK_DEBUG_FONTS
29 #define SK_DEBUG_FONTS 0 29 #define SK_DEBUG_FONTS 0
30 #endif 30 #endif
31 31
32 #if SK_DEBUG_FONTS 32 #if SK_DEBUG_FONTS
33 #define DEBUG_FONT(args) SkDebugf args 33 #define DEBUG_FONT(args) SkDebugf args
34 #else 34 #else
35 #define DEBUG_FONT(args) 35 #define DEBUG_FONT(args)
36 #endif 36 #endif
37 37
38 SK_DEFINE_INST_COUNT(SkFontConfigInterface)
39
38 /////////////////////////////////////////////////////////////////////////////// 40 ///////////////////////////////////////////////////////////////////////////////
39 41
40 // For test only. 42 // For test only.
41 static const char* gTestMainConfigFile = NULL; 43 static const char* gTestMainConfigFile = NULL;
42 static const char* gTestFallbackConfigFile = NULL; 44 static const char* gTestFallbackConfigFile = NULL;
43 static const char* gTestFontFilePrefix = NULL; 45 static const char* gTestFontFilePrefix = NULL;
44 46
45 /////////////////////////////////////////////////////////////////////////////// 47 ///////////////////////////////////////////////////////////////////////////////
46 48
47 typedef int32_t FontRecID; 49 typedef int32_t FontRecID;
(...skipping 877 matching lines...) Expand 10 before | Expand all | Expand 10 after
925 return SkCreateTypefaceForScriptNG(getHBScriptFromHBScriptOld(script), style , fontVariant); 927 return SkCreateTypefaceForScriptNG(getHBScriptFromHBScriptOld(script), style , fontVariant);
926 } 928 }
927 929
928 #endif 930 #endif
929 931
930 /////////////////////////////////////////////////////////////////////////////// 932 ///////////////////////////////////////////////////////////////////////////////
931 933
932 SkFontMgr* SkFontMgr::Factory() { 934 SkFontMgr* SkFontMgr::Factory() {
933 return NULL; 935 return NULL;
934 } 936 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698