Replace SkTypeface::Style with SkFontStyle.

Replace SkTypeface::Style with SkFontStyle.

Committed: https://skia.googlesource.com/skia/+/43b8b36b20ae00e2d78421c4cda1f3f922983a20

Committed: https://skia.googlesource.com/skia/+/a4c4a2d8cd65abb1e5ac20813831cdb9ace6c7ee

[bungeman-skia, 2014-08-21 15:50:15]

There is even more to be done, but this seemed like a good place to stop.

[bungeman-skia, 2014-10-16 21:10:10]

The failure in fontmgr_iter on ChromeOS is actually a fix for fallback weight
selection.

[bungeman-skia, 2014-10-17 18:36:40]

After some time trying to consider a way to stage this globally, I have come to
the conclusion that it is easier to start out like this and replace use of
SkTypeface::Style with SkFontStyle internally and then stage the API changes
later. In the end, I would still like for SkFontStyle to end up being the
replacement SkTypeface::Style.

[reed1, 2014-10-17 18:50:31]

I like the idea

https://codereview.chromium.org/488143002/diff/100001/src/ports/SkFontConfigT...
File src/ports/SkFontConfigTypeface.h (right):

https://codereview.chromium.org/488143002/diff/100001/src/ports/SkFontConfigT...
src/ports/SkFontConfigTypeface.h:21: static FontConfigTypeface*
Create(SkFontStyle style,
why not "const SkFontStyle&" everywhere, since its a class and (may) get
bigger/more complex in the future?

[bungeman-skia, 2014-10-17 19:56:48]

https://codereview.chromium.org/488143002/diff/100001/src/ports/SkFontConfigT...
File src/ports/SkFontConfigTypeface.h (right):

https://codereview.chromium.org/488143002/diff/100001/src/ports/SkFontConfigT...
src/ports/SkFontConfigTypeface.h:21: static FontConfigTypeface*
Create(SkFontStyle style,
On 2014/10/17 18:50:31, reed1 wrote:
> why not "const SkFontStyle&" everywhere, since its a class and (may) get
> bigger/more complex in the future?

Done. I didn't do it now since I'm replacing a value, and SkFontStyle is rather
small. However, you're right, in some cases this could get rather large with
lots of overriding preferences attached.

[reed1, 2014-10-20 18:39:56]

lgtm w/ documentation comments

https://codereview.chromium.org/488143002/diff/120001/include/core/SkFontStyle.h
File include/core/SkFontStyle.h (right):

https://codereview.chromium.org/488143002/diff/120001/include/core/SkFontStyl...
include/core/SkFontStyle.h:46: explicit SkFontStyle(unsigned oldStyle);
// oldStyle means the style-bits in typeface: bold=1, italic=2

https://codereview.chromium.org/488143002/diff/120001/include/core/SkTypeface.h
File include/core/SkTypeface.h (right):

https://codereview.chromium.org/488143002/diff/120001/include/core/SkTypeface...
include/core/SkTypeface.h:57: /** Returns the typeface's intrinsic style
attributes. */
mark as DEPRECATED?

[bungeman-skia, 2014-10-20 19:15:39]

https://codereview.chromium.org/488143002/diff/120001/include/core/SkFontStyle.h
File include/core/SkFontStyle.h (right):

https://codereview.chromium.org/488143002/diff/120001/include/core/SkFontStyl...
include/core/SkFontStyle.h:46: explicit SkFontStyle(unsigned oldStyle);
On 2014/10/20 18:39:56, reed1 wrote:
> // oldStyle means the style-bits in typeface: bold=1, italic=2

Done.

https://codereview.chromium.org/488143002/diff/120001/include/core/SkTypeface.h
File include/core/SkTypeface.h (right):

https://codereview.chromium.org/488143002/diff/120001/include/core/SkTypeface...
include/core/SkTypeface.h:57: /** Returns the typeface's intrinsic style
attributes. */
On 2014/10/20 18:39:56, reed1 wrote:
> mark as DEPRECATED?

This question is why this isn't already checked in. I'd like to just straight up
replace SkTypeface::Style with SkFontStyle. That is, just remove the existing
SkTypeface::Stye implementation and replace the implementation with
SkFontStyle's implementation. I only really added the 'fontStyle' getter here
because we need it in several places, but I'd like to sneakily rename
fontStyle() to style() and remove this existing code. However, at the moment
there's too much using it to stage such a change. This CL and hopefully one more
may get us to the point where this is possible. I'd like to get all of that done
before anyone actually ever uses fontStyle() outside of Skia.

That being said, I can document this particular call as being deprecated, since
it is. If the return type changes, that's a new function which isn't deprecated,
right?

[bungeman-skia, 2014-10-20 19:15:48]

The CQ bit was checked by bungeman@google.com

[commit-bot: I haz the power, 2014-10-20 19:16:34]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/488143002/140001

[commit-bot: I haz the power, 2014-10-20 19:17:12]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-10-20 19:17:13]

Failed to apply patch for gyp/public_headers.gypi:
While running git apply --index -3 -p1;
  error: patch failed: gyp/public_headers.gypi:44
  Falling back to three-way merge...
  Applied patch to 'gyp/public_headers.gypi' with conflicts.
  U gyp/public_headers.gypi

Patch:       gyp/public_headers.gypi
Index: gyp/public_headers.gypi
diff --git a/gyp/public_headers.gypi b/gyp/public_headers.gypi
index
4ee02d5512bea990ba1503a2fd4d00ebaf26eca8..8c892fa4aa4f6555e749d3db83ad1518850e28c9
100644
--- a/gyp/public_headers.gypi
+++ b/gyp/public_headers.gypi
@@ -44,6 +44,7 @@
       'core/SkFloatingPoint.h',
       'core/SkFontHost.h',
       'core/SkFontLCDConfig.h',
+      'core/SkFontStyle.h',
       'core/SkGeometry.h',
       'core/SkGraphics.h',
       'core/SkImage.h',
@@ -195,7 +196,6 @@
       'pipe/SkGPipe.h',
       'ports/SkFontConfigInterface.h',
       'ports/SkFontMgr.h',
-      'ports/SkFontStyle.h',
       'ports/SkTypeface_android.h',
       'ports/SkTypeface_mac.h',
       'ports/SkTypeface_win.h',

[bungeman-skia, 2014-10-20 19:25:29]

The CQ bit was checked by bungeman@google.com

[commit-bot: I haz the power, 2014-10-20 19:25:52]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/488143002/160001

[commit-bot: I haz the power, 2014-10-20 19:34:06]

Committed patchset #9 (id:160001) as 43b8b36b20ae00e2d78421c4cda1f3f922983a20

[mtklein, 2014-10-20 19:53:53]

A revert of this CL (patchset #9 id:160001) has been created in
https://codereview.chromium.org/667023002/ by mtklein@google.com.

The reason for reverting is: CrOS GM failures:

[*] 2 ExpectationsMismatch: fontmgr_iter_565.png fontmgr_iter_8888.png 
.

[bungeman-skia, 2014-10-20 20:25:10]

The CQ bit was checked by bungeman@google.com

[commit-bot: I haz the power, 2014-10-20 20:25:46]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/488143002/180001

[commit-bot: I haz the power, 2014-10-20 20:33:36]

Committed patchset #10 (id:180001) as a4c4a2d8cd65abb1e5ac20813831cdb9ace6c7ee