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

Side by Side Diff: src/utils/SkLua.cpp

Issue 1818043002: SkTypeface::MakeFromName to take SkFontStyle. (Closed) Base URL: https://chromium.googlesource.com/skia.git@master
Patch Set: Android fix + nit fix Created 4 years, 6 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/fonts/SkTestScalerContext.h ('k') | src/utils/SkWhitelistTypefaces.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 * Copyright 2013 Google Inc. 2 * Copyright 2013 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 #include "SkLua.h" 8 #include "SkLua.h"
9 9
10 #if SK_SUPPORT_GPU 10 #if SK_SUPPORT_GPU
(...skipping 2031 matching lines...) Expand 10 before | Expand all | Expand 10 after
2042 int style = SkTypeface::kNormal; 2042 int style = SkTypeface::kNormal;
2043 2043
2044 int count = lua_gettop(L); 2044 int count = lua_gettop(L);
2045 if (count > 0 && lua_isstring(L, 1)) { 2045 if (count > 0 && lua_isstring(L, 1)) {
2046 name = lua_tolstring(L, 1, nullptr); 2046 name = lua_tolstring(L, 1, nullptr);
2047 if (count > 1 && lua_isnumber(L, 2)) { 2047 if (count > 1 && lua_isnumber(L, 2)) {
2048 style = lua_tointegerx(L, 2, nullptr) & SkTypeface::kBoldItalic; 2048 style = lua_tointegerx(L, 2, nullptr) & SkTypeface::kBoldItalic;
2049 } 2049 }
2050 } 2050 }
2051 2051
2052 sk_sp<SkTypeface> face(SkTypeface::MakeFromName(name, (SkTypeface::Style)sty le)); 2052 sk_sp<SkTypeface> face(SkTypeface::MakeFromName(name, SkFontStyle::FromOldSt yle(style)));
2053 // SkDebugf("---- name <%s> style=%d, face=%p ref=%d\n", name, style, face, f ace->getRefCnt()); 2053 // SkDebugf("---- name <%s> style=%d, face=%p ref=%d\n", name, style, face, f ace->getRefCnt());
2054 if (nullptr == face) { 2054 if (nullptr == face) {
2055 face = SkTypeface::MakeDefault(); 2055 face = SkTypeface::MakeDefault();
2056 } 2056 }
2057 push_ref(L, std::move(face)); 2057 push_ref(L, std::move(face));
2058 return 1; 2058 return 1;
2059 } 2059 }
2060 2060
2061 static int lsk_newRasterSurface(lua_State* L) { 2061 static int lsk_newRasterSurface(lua_State* L) {
2062 int width = lua2int_def(L, 1, 0); 2062 int width = lua2int_def(L, 1, 0);
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
2136 REG_CLASS(L, SkTextBlob); 2136 REG_CLASS(L, SkTextBlob);
2137 REG_CLASS(L, SkTypeface); 2137 REG_CLASS(L, SkTypeface);
2138 REG_CLASS(L, SkXfermode); 2138 REG_CLASS(L, SkXfermode);
2139 } 2139 }
2140 2140
2141 extern "C" int luaopen_skia(lua_State* L); 2141 extern "C" int luaopen_skia(lua_State* L);
2142 extern "C" int luaopen_skia(lua_State* L) { 2142 extern "C" int luaopen_skia(lua_State* L) {
2143 SkLua::Load(L); 2143 SkLua::Load(L);
2144 return 0; 2144 return 0;
2145 } 2145 }
OLDNEW
« no previous file with comments | « src/fonts/SkTestScalerContext.h ('k') | src/utils/SkWhitelistTypefaces.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698