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

Issue 1873923002: Begin switch to SkFontStyle for legacy calls. (Closed)

Created:
4 years, 8 months ago by bungeman-skia
Modified:
4 years, 8 months ago
Reviewers:
dogben, mtklein, reed1
CC:
reviews_skia.org
Base URL:
https://skia.googlesource.com/skia.git@master
Target Ref:
refs/heads/master
Project:
skia
Visibility:
Public.

Description

Begin switch to SkFontStyle for legacy calls. This adds SK_VERY_LEGACY_CREATE_TYPEFACE which, when defined, provides only the old interface. Ideally, everyone would switch directly to SkFontMgr and use one of the newer calls, but there is currently no path for current users to get there. This updates all the internals to use SkFontStyle, after switching these over the higher level APIs can be switched. The Chromium follow on patch can be seen at https://crrev.com/1877673002 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873923002 TBR=reed This doesn't really change API, just modernizes it. Committed: https://skia.googlesource.com/skia/+/11a77c6e0634e2feb6fe4e74806db2fdd2a799ec

Patch Set 1 #

Patch Set 2 : Fix Windows. #

Patch Set 3 : Copy pasta. #

Patch Set 4 : More #

Patch Set 5 : Uncomment. #

Patch Set 6 : Fixes, rebase. #

Total comments: 4

Patch Set 7 : Address comments. #

Patch Set 8 : Actually upload one of those changes. #

Patch Set 9 : Remove last styleBits from Mac. #

Patch Set 10 : Dont update bzl file now. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+321 lines, -118 lines) Patch
M gm/fontmgr.cpp View 1 2 3 1 chunk +4 lines, -0 lines 0 comments Download
M include/core/SkFontStyle.h View 1 2 3 4 5 6 7 1 chunk +2 lines, -2 lines 0 comments Download
M include/ports/SkFontConfigInterface.h View 1 chunk +8 lines, -0 lines 0 comments Download
M include/ports/SkFontMgr.h View 1 2 3 2 chunks +10 lines, -2 lines 0 comments Download
M include/ports/SkFontMgr_indirect.h View 1 chunk +14 lines, -11 lines 0 comments Download
M src/core/SkFontMgr.cpp View 1 2 3 2 chunks +10 lines, -3 lines 0 comments Download
M src/core/SkFontStyle.cpp View 1 2 3 1 chunk +6 lines, -7 lines 0 comments Download
M src/core/SkTypeface.cpp View 1 2 3 4 5 2 chunks +8 lines, -0 lines 0 comments Download
M src/fonts/SkFontMgr_fontconfig.cpp View 1 2 3 4 5 1 chunk +7 lines, -3 lines 0 comments Download
M src/fonts/SkFontMgr_indirect.cpp View 1 2 3 1 chunk +6 lines, -8 lines 0 comments Download
M src/ports/SkFontConfigInterface_direct.h View 1 chunk +9 lines, -0 lines 0 comments Download
M src/ports/SkFontConfigInterface_direct.cpp View 1 2 3 4 5 6 5 chunks +145 lines, -0 lines 0 comments Download
M src/ports/SkFontConfigTypeface.h View 1 chunk +4 lines, -0 lines 0 comments Download
M src/ports/SkFontHost_fontconfig.cpp View 1 2 3 4 chunks +22 lines, -5 lines 0 comments Download
M src/ports/SkFontHost_mac.cpp View 1 2 3 4 5 6 7 8 3 chunks +11 lines, -22 lines 0 comments Download
M src/ports/SkFontHost_win.cpp View 1 2 3 4 5 2 chunks +8 lines, -5 lines 0 comments Download
M src/ports/SkFontMgr_android.cpp View 1 2 3 1 chunk +6 lines, -5 lines 0 comments Download
M src/ports/SkFontMgr_custom.cpp View 1 2 3 1 chunk +5 lines, -8 lines 0 comments Download
M src/ports/SkFontMgr_fontconfig.cpp View 1 2 3 4 5 6 3 chunks +9 lines, -20 lines 0 comments Download
M src/ports/SkFontMgr_win_dw.cpp View 1 2 3 3 chunks +22 lines, -16 lines 0 comments Download
M tools/sk_tool_utils_font.cpp View 1 2 3 2 chunks +5 lines, -1 line 0 comments Download

Messages

Total messages: 48 (24 generated)
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1873923002/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1873923002/1
4 years, 8 months ago (2016-04-08 19:45:20 UTC) #3
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: Build-Win-MSVC-x86-Debug-Trybot on client.skia.compile (JOB_FAILED, http://build.chromium.org/p/client.skia.compile/builders/Build-Win-MSVC-x86-Debug-Trybot/builds/7752)
4 years, 8 months ago (2016-04-08 19:47:50 UTC) #5
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1873923002/20001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1873923002/20001
4 years, 8 months ago (2016-04-08 19:55:58 UTC) #7
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: Build-Win-MSVC-x86-Debug-Trybot on client.skia.compile (JOB_FAILED, http://build.chromium.org/p/client.skia.compile/builders/Build-Win-MSVC-x86-Debug-Trybot/builds/7753) Build-Win-MSVC-x86_64-Debug-Trybot on ...
4 years, 8 months ago (2016-04-08 19:59:09 UTC) #9
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1873923002/40001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1873923002/40001
4 years, 8 months ago (2016-04-08 20:20:37 UTC) #11
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: Build-Win-MSVC-x86_64-Debug-Trybot on client.skia.compile (JOB_FAILED, http://build.chromium.org/p/client.skia.compile/builders/Build-Win-MSVC-x86_64-Debug-Trybot/builds/7800)
4 years, 8 months ago (2016-04-08 20:24:08 UTC) #13
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1873923002/60001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1873923002/60001
4 years, 8 months ago (2016-04-08 21:40:09 UTC) #15
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: Build-Mac-Clang-x86_64-Release-Trybot on client.skia.compile (JOB_FAILED, http://build.chromium.org/p/client.skia.compile/builders/Build-Mac-Clang-x86_64-Release-Trybot/builds/1844)
4 years, 8 months ago (2016-04-08 21:41:40 UTC) #17
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1873923002/80001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1873923002/80001
4 years, 8 months ago (2016-04-11 14:29:38 UTC) #19
commit-bot: I haz the power
Dry run: This issue passed the CQ dry run.
4 years, 8 months ago (2016-04-11 14:41:59 UTC) #21
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1873923002/100001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1873923002/100001
4 years, 8 months ago (2016-04-11 17:31:46 UTC) #24
bungeman-skia
4 years, 8 months ago (2016-04-11 17:36:15 UTC) #26
commit-bot: I haz the power
Dry run: This issue passed the CQ dry run.
4 years, 8 months ago (2016-04-11 17:48:37 UTC) #28
dogben
Why not this? #ifdef SK_VERY_LEGACY_CREATE_TYPEFACE SkTypeface* legacyCreateTypeface(const char familyName[], unsigned typefaceStyleBits) const; #endif SkTypeface* legacyCreateTypeface(const ...
4 years, 8 months ago (2016-04-11 17:55:28 UTC) #29
bungeman-skia
On 2016/04/11 17:55:28, Ben Wagner wrote: > Why not this? > #ifdef SK_VERY_LEGACY_CREATE_TYPEFACE > SkTypeface* ...
4 years, 8 months ago (2016-04-11 18:16:13 UTC) #30
dogben
lgtm A couple comments on things that don't quite seem right, but if I'm mistaken, ...
4 years, 8 months ago (2016-04-11 20:28:58 UTC) #31
bungeman-skia
https://codereview.chromium.org/1873923002/diff/100001/include/core/SkFontStyle.h File include/core/SkFontStyle.h (right): https://codereview.chromium.org/1873923002/diff/100001/include/core/SkFontStyle.h#newcode49 include/core/SkFontStyle.h:49: explicit SkFontStyle(uint32_t d) On 2016/04/11 20:28:58, Ben Wagner wrote: ...
4 years, 8 months ago (2016-04-11 21:55:53 UTC) #32
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1873923002/140001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1873923002/140001
4 years, 8 months ago (2016-04-11 21:58:35 UTC) #34
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: Build-Mac-Clang-x86_64-Release-Trybot on client.skia.compile (JOB_FAILED, http://build.chromium.org/p/client.skia.compile/builders/Build-Mac-Clang-x86_64-Release-Trybot/builds/1884)
4 years, 8 months ago (2016-04-11 22:00:06 UTC) #36
dogben
lgtm I'm assuming there's a good reason for having two copies of the map_ranges code.
4 years, 8 months ago (2016-04-11 22:23:17 UTC) #37
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1873923002/160001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1873923002/160001
4 years, 8 months ago (2016-04-12 15:22:12 UTC) #39
commit-bot: I haz the power
Dry run: This issue passed the CQ dry run.
4 years, 8 months ago (2016-04-12 15:34:21 UTC) #41
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1873923002/180001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1873923002/180001
4 years, 8 months ago (2016-04-12 20:33:30 UTC) #46
commit-bot: I haz the power
4 years, 8 months ago (2016-04-12 20:45:11 UTC) #48
Message was sent while issue was closed.
Committed patchset #10 (id:180001) as
https://skia.googlesource.com/skia/+/11a77c6e0634e2feb6fe4e74806db2fdd2a799ec

Powered by Google App Engine
This is Rietveld 408576698