Partial revert of 43b8b36b20ae.

With 43b8b36b20ae00e2d78421c4cda1f3f922983a20 blink_perf.layout regressed.
It appears that the typeface cache is being missed.
This is a partial revert of the Skia change which reverts the smallest
amount of code to restore performance.

BUG=chromium:425566

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

Cherry-pick: 47eda52e8fb88f0725b401762a3e0bddc98e9fb3
Approval: https://code.google.com/p/chromium/issues/detail?id=425566#c19