Merge 2840: Re-limit the CJK font hack for Android to only when the content language is available

Merge 2840: Re-limit the CJK font hack for Android to only when the content language is available

Android FontCache has a hack for CJK, put in 2013 or earlier. This hack
kicked in only when the content language is one of CJK until M53, but
the fix for crbug.com/609043 unintentionally enabled it when the
content language is missing and the system language is one of CJK.

As a quick fix to ease the possible merge to M54, this patch limits the
hack to the same criteria as M53 without reverting crbug.com/609043.

A long term solution is to entirely remove this hack, but it will need
changes to Skia and possibly to fonts.xml as well. This will be worked
out separately.

BUG=652146
Review-Url: https://codereview.chromium.org/2390623002
Cr-Commit-Position: refs/heads/master@{#422424}
(cherry picked from commit 907fee664f47db6be9319c941a7e219ef4052c2b)

Committed: https://chromium.googlesource.com/chromium/src/+/6c440f50d160866d1063f87527c9c9e8c521d8df

[kojii, 2016-10-06 18:48:14]

Description was changed from

==========
Merge 2840: Re-limit the CJK font hack for Android to only when the content
language is available

Android FontCache has a hack for CJK, put in 2013 or earlier. This hack
kicked in only when the content language is one of CJK until M53, but
the fix for crbug.com/609043 unintentionally enabled it when the
content language is missing and the system language is one of CJK.

As a quick fix to ease the possible merge to M54, this patch limits the
hack to the same criteria as M53 without reverting crbug.com/609043.

A long term solution is to entirely remove this hack, but it will need
changes to Skia and possibly to fonts.xml as well. This will be worked
out separately.

BUG=652146

Review-Url: https://codereview.chromium.org/2390623002
Cr-Commit-Position: refs/heads/master@{#422424}
(cherry picked from commit 907fee664f47db6be9319c941a7e219ef4052c2b)
==========

to

==========
Merge 2840: Re-limit the CJK font hack for Android to only when the content
language is available

Android FontCache has a hack for CJK, put in 2013 or earlier. This hack
kicked in only when the content language is one of CJK until M53, but
the fix for crbug.com/609043 unintentionally enabled it when the
content language is missing and the system language is one of CJK.

As a quick fix to ease the possible merge to M54, this patch limits the
hack to the same criteria as M53 without reverting crbug.com/609043.

A long term solution is to entirely remove this hack, but it will need
changes to Skia and possibly to fonts.xml as well. This will be worked
out separately.

BUG=652146

Review-Url: https://codereview.chromium.org/2390623002
Cr-Commit-Position: refs/heads/master@{#422424}
(cherry picked from commit 907fee664f47db6be9319c941a7e219ef4052c2b)

Committed:
https://chromium.googlesource.com/chromium/src/+/6c440f50d160866d1063f87527c9...
==========

[kojii, 2016-10-06 18:48:16]

Committed patchset #1 (id:1) manually as
6c440f50d160866d1063f87527c9c9e8c521d8df.