diff options
| author |  mtklein <mtklein@google.com> | 2014-10-20 12:54:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-20 12:54:31 -0700 |
| commit | 802ad83dca2efd57fde6c7ba666555ea78b5324c (patch) | |
| tree | de3ef90d0e9906ee2c16388b58e17e12976d833b /gyp | |
| parent | 43b8b36b20ae00e2d78421c4cda1f3f922983a20 (diff) | |
Revert of Replace SkTypeface::Style with SkFontStyle. (patchset #9 id:160001 of https://codereview.chromium.org/488143002/)
Reason for revert:
CrOS GM failures:
[*] 2 ExpectationsMismatch: fontmgr_iter_565.png fontmgr_iter_8888.png
Original issue's description:
> Replace SkTypeface::Style with SkFontStyle.
>
> Committed: https://skia.googlesource.com/skia/+/43b8b36b20ae00e2d78421c4cda1f3f922983a20
TBR=reed@google.com,bungeman@google.com
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/667023002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/core.gypi | 1 | ||||
| -rw-r--r-- | gyp/ports.gyp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/gyp/core.gypi b/gyp/core.gypi index 4f9379f42b..5e811163fe 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -248,7 +248,6 @@ '<(skia_include_path)/core/SkFloatBits.h', '<(skia_include_path)/core/SkFloatingPoint.h', '<(skia_include_path)/core/SkFontHost.h', - '<(skia_include_path)/core/SkFontStyle.h', '<(skia_include_path)/core/SkGraphics.h', '<(skia_include_path)/core/SkImage.h', '<(skia_include_path)/core/SkImageDecoder.h', diff --git a/gyp/ports.gyp b/gyp/ports.gyp index 78d59dfe03..268f6fd4d9 100644 --- a/gyp/ports.gyp +++ b/gyp/ports.gyp @@ -60,6 +60,7 @@ '../include/ports/SkFontConfigInterface.h', '../include/ports/SkFontMgr.h', '../include/ports/SkFontMgr_indirect.h', + '../include/ports/SkFontStyle.h', '../include/ports/SkRemotableFontMgr.h', ], 'conditions': [ |