Clean up DirectWrite typeface cache matching.

Clean up DirectWrite typeface cache matching.

The matching code was difficult to follow due to naming issues,
and performed some duplicate work which is not wanted.
This change will either fix the associated bug or make it possible
to track the cause.

CQ_EXTRA_TRYBOTS=tryserver.skia:Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite-Trybot

BUG=384529
Committed: https://skia.googlesource.com/skia/+/33eb30fed8aa45c47a65e684e1b65da2b2e1fb91

[reed1, 2014-06-16 19:22:00]

lgtm

[bungeman-skia, 2014-06-16 22:25:04]

The CQ bit was checked by bungeman@google.com

[commit-bot: I haz the power, 2014-06-16 22:26:06]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/bungeman@google.com/338923003/1

[commit-bot: I haz the power, 2014-06-16 23:58:58]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-16 23:58:59]

Try jobs failed on following builders:
  Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite-Trybot on tryserver.skia
(http://108.170.220.120:10117/builders/Test-Win7-ShuttleA-HD2000-x86-Release-D...)

[bungeman-skia, 2014-06-17 20:47:36]

The CQ bit was checked by bungeman@google.com

[commit-bot: I haz the power, 2014-06-17 20:48:07]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/bungeman@google.com/338923003/1

[commit-bot: I haz the power, 2014-06-18 01:12:57]

Change committed as 33eb30fed8aa45c47a65e684e1b65da2b2e1fb91