Commit 0084a132 authored by rsadam@chromium.org's avatar rsadam@chromium.org

Revert of Add Unicode Variation Selector support on Linux official builds...

Revert of Add Unicode Variation Selector support on Linux official builds (patchset #1 id:1 of https://codereview.chromium.org/1283923002/ )

Reason for revert:
This CL prevents building official Chrome images on Linux.

../../third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp:176:13: error: use of undeclared identifier 'hb_ot_font_set_funcs'

The proposed workaround doesn't work, so reverting this CL.

Original issue's description:
> Add Unicode Variation Selector support on Linux official builds
> 
> Most of the work to support Unicode Variation Selector was done in a
> separate CL[1], but it was not enabled for Linux due to crbug.com/462689.
> 
> This patch enables the Unicode Variation Selector support on Linux
> official builds.
> 
> The CL to enable on all Linux[2] was reverted because chromeos=1 is still
> bound to the harfbuzz in the system and thus unable to use
> hb_ot_font_set_funcs() on Trusty.
> 
> [1] https://codereview.chromium.org/1149693002/
> [2] https://codereview.chromium.org/1209043010/
> 
> BUG=383580
> 
> Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=200427

TBR=eae@chromium.org,drott@chromium.org,kojii@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=383580

Review URL: https://codereview.chromium.org/1292583006

git-svn-id: svn://svn.chromium.org/blink/trunk@200747 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent ece9ebac
......@@ -162,10 +162,9 @@ static hb_bool_t harfBuzzGetGlyph(hb_font_t* hbFont, void* fontData, hb_codepoin
HarfBuzzFontData* hbFontData = reinterpret_cast<HarfBuzzFontData*>(fontData);
if (variationSelector) {
#if OS(LINUX) && !defined(OFFICIAL_BUILD)
// TODO(kojii): Linux non-official builds cannot use hb_ot_font_set_funcs()
// until we find a way to bundle HB in non-official builds, or pangoft2
// updates its HB. See crbug.com/462689.
#if OS(LINUX)
// TODO(kojii): Linux non-official builds cannot use new HB APIs
// until crbug.com/462689 resolved or pangoft2 updates its HB.
return false;
#else
// Skia does not support variation selectors, but hb does.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment