diff options
| author |  Mike Reed <reed@google.com> | 2017-10-06 19:37:25 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-06 19:37:38 +0000 |
| commit | cf331a9e7c814c7a19dfc94c678aba2178d738cc (patch) | |
| tree | 4eb45474993c376ae44eddf5ae822f32cfab5fac /gn/flutter_defines.gni | |
| parent | 24295462722fd5a298d108a80b0aacbb0964da53 (diff) | |
Revert[3] "remove legacy fontmgr flag from flutter"
This reverts commit cbfd8bf7c098bff938d0f575584a7a82b354c621.
Reason for revert: broke again
../../garnet/public/lib/ui/skia/skia_font_loader.cc:29:42: error: no member named 'createFromData' in 'SkFontMgr'
SkFontMgr::RefDefault()->createFromData(font_data.get())));
Original change's description:
> Revert "Revert "remove legacy fontmgr flag from flutter""
>
> This reverts commit da6cf4e97ca334b408dda2344b6758970802eddd.
>
> Reason for revert: fix landed in flutter
>
> Original change's description:
> > Revert "remove legacy fontmgr flag from flutter"
> >
> > This reverts commit 7077ae855519a23b087ded7386e18b475ac73c48.
> >
> > Reason for revert: Breaking flutter [1]:
> >
> > ../../flutter/sky/engine/platform/fonts/fuchsia/FontCacheFuchsia.cpp:136:53: error: no member named 'createFromData' in 'SkFontMgr'
> > return sk_sp<SkTypeface>(SkFontMgr::RefDefault()->createFromData(data.get()));
> > ~~~~~~~~~~~~~~~~~~~~~~~ ^
> > 1 error generated.
> >
> > [1] https://luci-logdog.appspot.com/v/?s=fuchsia%2Fbuildbucket%2Fcr-buildbucket.appspot.com%2F8966486899186212448%2F%2B%2Fsteps%2Fbuild_fuchsia%2F0%2Fsteps%2Fninja%2F0%2Fstdout
> >
> > Original change's description:
> > > remove legacy fontmgr flag from flutter
> > >
> > > Bug: skia:
> > > Change-Id: I82d16b398ea8bb7309378f475d94d9dea0b263d5
> > > Reviewed-on: https://skia-review.googlesource.com/56160
> > > Reviewed-by: Mike Reed <reed@google.com>
> > > Commit-Queue: Mike Reed <reed@google.com>
> >
> > TBR=reed@google.com,reed@chromium.org
> >
> > Change-Id: I942a9c51dd4673fb2088610ddc2bffd414fbc4d8
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Bug: skia:
> > Reviewed-on: https://skia-review.googlesource.com/56320
> > Reviewed-by: Leon Scroggins <scroggo@google.com>
> > Commit-Queue: Leon Scroggins <scroggo@google.com>
>
> TBR=scroggo@google.com,reed@google.com,reed@chromium.org
>
> Change-Id: Idbb1205e4f7548b683da7d08e9a954fc97be7489
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/56761
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
TBR=scroggo@google.com,reed@google.com,reed@chromium.org
Change-Id: I43a92fccae128f944ed1c6b57d635db322698545
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/56840
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'gn/flutter_defines.gni')
| -rw-r--r-- | gn/flutter_defines.gni | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gn/flutter_defines.gni b/gn/flutter_defines.gni index 3e1a48e51e..8d8520edb3 100644 --- a/gn/flutter_defines.gni +++ b/gn/flutter_defines.gni @@ -4,5 +4,6 @@ # found in the LICENSE file. flutter_defines = [ "SK_SUPPORT_LEGACY_IMAGE_ENCODE_API", + "SK_SUPPORT_LEGACY_FONTMGR_API", "SK_SUPPORT_LEGACY_SAFESIZE64", ] |