Ensure that we use different glyph entries for regular and df text.

Ensure that we use different glyph entries for regular and df text.

Currently if we switch between regular text and df text while using
the same GrContext, they may use the same entry in the Ganesh font cache,
which is incorrect. This change ensures that they will have different entries.

Committed: https://skia.googlesource.com/skia/+/8dc58edd71c11f232860724dfa3b566895478034

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

[jvanverth1, 2015-03-18 19:21:16]

jvanverth@google.com changed reviewers:
+ joshualitt@google.com

[joshualitt, 2015-03-18 19:24:25]

On 2015/03/18 19:21:16, jvanverth1 wrote:

lgtm

[jvanverth1, 2015-03-18 21:41:25]

The CQ bit was checked by jvanverth@google.com

[commit-bot: I haz the power, 2015-03-18 21:41:38]

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

[commit-bot: I haz the power, 2015-03-18 21:46:41]

Committed patchset #2 (id:20001) as
https://skia.googlesource.com/skia/+/8dc58edd71c11f232860724dfa3b566895478034

[jvanverth1, 2015-03-18 22:13:40]

A revert of this CL (patchset #2 id:20001) has been created in
https://codereview.chromium.org/1011403005/ by jvanverth@google.com.

The reason for reverting is: Bad glyphs in dftext GM..

[jvanverth1, 2015-03-19 13:08:09]

The CQ bit was checked by jvanverth@google.com

[commit-bot: I haz the power, 2015-03-19 13:08:21]

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

[commit-bot: I haz the power, 2015-03-19 13:08:35]

Committed patchset #2 (id:20001) as
https://skia.googlesource.com/skia/+/a7634619ec653e94a8a506ca86c233753d10510e