Merge to XFA: Unrevert commit a398ca6 and apply the proper fix.
authorLei Zhang <thestig@chromium.org>
Mon, 19 Oct 2015 19:07:32 +0000 (12:07 -0700)
committerLei Zhang <thestig@chromium.org>
Mon, 19 Oct 2015 19:07:32 +0000 (12:07 -0700)
commit184e4a189d1391bff014aa6ecc0f9b0d83081826
treef7b84103102121d9e044558c92f9c248499e02fd
parentaa8ea6dbb4fc81c03fffe6a531106f64508c296d
Merge to XFA: Unrevert commit a398ca6 and apply the proper fix.

TBR=tsepez@chromium.org

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

(cherry picked from commit 894d1cd3f56b1c8c33c5a60ebfec14384e5002d0)

Review URL: https://codereview.chromium.org/1413213002 .
core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp