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

Side by Side Diff: src/ports/SkFontConfigInterface_android.cpp

Issue 408143010: Revert of SkFontMgr for Android. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 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 | « gyp/ports.gyp ('k') | src/ports/SkFontConfigParser_android.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 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 889 matching lines...) Expand 10 before | Expand all | Expand 10 after
900 key.typeface = retTypeface; 900 key.typeface = retTypeface;
901 *gTypefaceTable.insert(~index) = key; 901 *gTypefaceTable.insert(~index) = key;
902 } 902 }
903 903
904 // we ref(), the caller is expected to unref when they are done 904 // we ref(), the caller is expected to unref when they are done
905 return SkSafeRef(retTypeface); 905 return SkSafeRef(retTypeface);
906 } 906 }
907 907
908 #endif 908 #endif
909 909
910 ///////////////////////////////////////////////////////////////////////////////
911
912 SkFontMgr* SkFontMgr::Factory() {
913 return NULL;
914 }
OLDNEW
« no previous file with comments | « gyp/ports.gyp ('k') | src/ports/SkFontConfigParser_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698