With https://chromium.googlesource.com/skia/+/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.
With https://chromium.googlesource.com/skia/+/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

Committed: https://skia.googlesource.com/skia/+/47eda52e8fb88f0725b401762a3e0bddc98e9fb3

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

MarshedOut/android_external_skia,aosp-mirror/platform_external_skia,tmpvar/skia.cc,jtg-gg/skia,MonkeyZZZZ/platform_external_skia,AOSP-YU/platform_external_skia,shahrzadmn/skia,YUPlayGodDev/platform_external_skia,boulzordev/android_external_skia,TeamTwisted/external_skia,TeamTwisted/external_skia,OneRom/external_skia,todotodoo/skia,MarshedOut/android_external_skia,vanish87/skia,spezi77/android_external_skia,geekboxzone/mmallow_external_skia,qrealka/skia-hc,google/skia,BrokenROM/external_skia,Hikari-no-Tenshi/android_external_skia,spezi77/android_external_skia,chenlian2015/skia_from_google,PAC-ROM/android_external_skia,noselhq/skia,google/skia,MinimalOS-AOSP/platform_external_skia,invisiblek/android_external_skia,shahrzadmn/skia,pcwalton/skia,BrokenROM/external_skia,nfxosp/platform_external_skia,DiamondLovesYou/skia-sys,Igalia/skia,MinimalOS-AOSP/platform_external_skia,google/skia,scroggo/skia,TeamTwisted/external_skia,PAC-ROM/android_external_skia,AOSP-YU/platform_external_skia,MinimalOS-AOSP/platform_external_skia,aosp-mirror/platform_external_skia,chenlian2015/skia_from_google,Infinitive-OS/platform_external_skia,HalCanary/skia-hc,Jichao/skia,aosp-mirror/platform_external_skia,w3nd1go/android_external_skia,ominux/skia,todotodoo/skia,YUPlayGodDev/platform_external_skia,UBERMALLOW/external_skia,VRToxin-AOSP/android_external_skia,jtg-gg/skia,todotodoo/skia,tmpvar/skia.cc,TeamTwisted/external_skia,samuelig/skia,amyvmiwei/skia,scroggo/skia,Hikari-no-Tenshi/android_external_skia,noselhq/skia,w3nd1go/android_external_skia,YUPlayGodDev/platform_external_skia,Hikari-no-Tenshi/android_external_skia,jtg-gg/skia,nfxosp/platform_external_skia,rubenvb/skia,nvoron23/skia,pcwalton/skia,AOSP-YU/platform_external_skia,pcwalton/skia,BrokenROM/external_skia,geekboxzone/mmallow_external_skia,scroggo/skia,vanish87/skia,scroggo/skia,shahrzadmn/skia,HalCanary/skia-hc,MinimalOS-AOSP/platform_external_skia,nfxosp/platform_external_skia,amyvmiwei/skia,qrealka/skia-hc,invisiblek/android_external_skia,VRToxin-AOSP/android_external_skia,amyvmiwei/skia,PAC-ROM/android_external_skia,tmpvar/skia.cc,pcwalton/skia,pcwalton/skia,spezi77/android_external_skia,UBERMALLOW/external_skia,AOSPB/external_skia,TeamExodus/external_skia,Jichao/skia,PAC-ROM/android_external_skia,invisiblek/android_external_skia,noselhq/skia,nvoron23/skia,nfxosp/platform_external_skia,Infinitive-OS/platform_external_skia,qrealka/skia-hc,timduru/platform-external-skia,AOSP-YU/platform_external_skia,w3nd1go/android_external_skia,nvoron23/skia,nfxosp/platform_external_skia,geekboxzone/mmallow_external_skia,HalCanary/skia-hc,timduru/platform-external-skia,YUPlayGodDev/platform_external_skia,nvoron23/skia,AOSP-YU/platform_external_skia,geekboxzone/mmallow_external_skia,boulzordev/android_external_skia,amyvmiwei/skia,rubenvb/skia,Jichao/skia,boulzordev/android_external_skia,TeamExodus/external_skia,google/skia,nvoron23/skia,UBERMALLOW/external_skia,aosp-mirror/platform_external_skia,noselhq/skia,qrealka/skia-hc,HalCanary/skia-hc,noselhq/skia,Igalia/skia,qrealka/skia-hc,ominux/skia,google/skia,samuelig/skia,DiamondLovesYou/skia-sys,MarshedOut/android_external_skia,UBERMALLOW/external_skia,jtg-gg/skia,VRToxin-AOSP/android_external_skia,timduru/platform-external-skia,chenlian2015/skia_from_google,PAC-ROM/android_external_skia,boulzordev/android_external_skia,rubenvb/skia,shahrzadmn/skia,vanish87/skia,MonkeyZZZZ/platform_external_skia,Infinitive-OS/platform_external_skia,w3nd1go/android_external_skia,MarshedOut/android_external_skia,ominux/skia,MarshedOut/android_external_skia,spezi77/android_external_skia,TeamExodus/external_skia,chenlian2015/skia_from_google,OneRom/external_skia,amyvmiwei/skia,rubenvb/skia,Jichao/skia,MarshedOut/android_external_skia,Infinitive-OS/platform_external_skia,todotodoo/skia,TeamExodus/external_skia,rubenvb/skia,tmpvar/skia.cc,ominux/skia,w3nd1go/android_external_skia,vanish87/skia,w3nd1go/android_external_skia,geekboxzone/mmallow_external_skia,VRToxin-AOSP/android_external_skia,rubenvb/skia,MinimalOS-AOSP/platform_external_skia,Hikari-no-Tenshi/android_external_skia,AOSPB/external_skia,boulzordev/android_external_skia,Hikari-no-Tenshi/android_external_skia,AOSPB/external_skia,noselhq/skia,HalCanary/skia-hc,Jichao/skia,Hikari-no-Tenshi/android_external_skia,aosp-mirror/platform_external_skia,nvoron23/skia,invisiblek/android_external_skia,amyvmiwei/skia,BrokenROM/external_skia,chenlian2015/skia_from_google,nvoron23/skia,aosp-mirror/platform_external_skia,Infinitive-OS/platform_external_skia,scroggo/skia,Hikari-no-Tenshi/android_external_skia,todotodoo/skia,nfxosp/platform_external_skia,TeamTwisted/external_skia,rubenvb/skia,timduru/platform-external-skia,boulzordev/android_external_skia,qrealka/skia-hc,w3nd1go/android_external_skia,chenlian2015/skia_from_google,VRToxin-AOSP/android_external_skia,MarshedOut/android_external_skia,pcwalton/skia,OneRom/external_skia,AOSP-YU/platform_external_skia,vanish87/skia,HalCanary/skia-hc,VRToxin-AOSP/android_external_skia,MonkeyZZZZ/platform_external_skia,google/skia,noselhq/skia,jtg-gg/skia,TeamTwisted/external_skia,DiamondLovesYou/skia-sys,scroggo/skia,shahrzadmn/skia,Igalia/skia,Infinitive-OS/platform_external_skia,AOSP-YU/platform_external_skia,TeamTwisted/external_skia,AOSP-YU/platform_external_skia,OneRom/external_skia,Jichao/skia,ominux/skia,invisiblek/android_external_skia,samuelig/skia,shahrzadmn/skia,amyvmiwei/skia,AOSPB/external_skia,scroggo/skia,YUPlayGodDev/platform_external_skia,nfxosp/platform_external_skia,todotodoo/skia,OneRom/external_skia,pcwalton/skia,YUPlayGodDev/platform_external_skia,geekboxzone/mmallow_external_skia,invisiblek/android_external_skia,OneRom/external_skia,MarshedOut/android_external_skia,Igalia/skia,noselhq/skia,google/skia,scroggo/skia,samuelig/skia,Igalia/skia,MonkeyZZZZ/platform_external_skia,DiamondLovesYou/skia-sys,nfxosp/platform_external_skia,TeamExodus/external_skia,nvoron23/skia,todotodoo/skia,rubenvb/skia,TeamExodus/external_skia,UBERMALLOW/external_skia,shahrzadmn/skia,PAC-ROM/android_external_skia,ominux/skia,google/skia,vanish87/skia,UBERMALLOW/external_skia,aosp-mirror/platform_external_skia,UBERMALLOW/external_skia,aosp-mirror/platform_external_skia,tmpvar/skia.cc,Igalia/skia,google/skia,geekboxzone/mmallow_external_skia,BrokenROM/external_skia,geekboxzone/mmallow_external_skia,MinimalOS-AOSP/platform_external_skia,YUPlayGodDev/platform_external_skia,amyvmiwei/skia,YUPlayGodDev/platform_external_skia,jtg-gg/skia,aosp-mirror/platform_external_skia,timduru/platform-external-skia,HalCanary/skia-hc,DiamondLovesYou/skia-sys,shahrzadmn/skia,Igalia/skia,pcwalton/skia,PAC-ROM/android_external_skia,spezi77/android_external_skia,MinimalOS-AOSP/platform_external_skia,geekboxzone/mmallow_external_skia,noselhq/skia,nvoron23/skia,shahrzadmn/skia,MinimalOS-AOSP/platform_external_skia,AOSPB/external_skia,vanish87/skia,TeamTwisted/external_skia,UBERMALLOW/external_skia,todotodoo/skia,HalCanary/skia-hc,rubenvb/skia,tmpvar/skia.cc,invisiblek/android_external_skia,VRToxin-AOSP/android_external_skia,tmpvar/skia.cc,ominux/skia,chenlian2015/skia_from_google,invisiblek/android_external_skia,w3nd1go/android_external_skia,BrokenROM/external_skia,TeamExodus/external_skia,todotodoo/skia,Infinitive-OS/platform_external_skia,samuelig/skia,timduru/platform-external-skia,PAC-ROM/android_external_skia,vanish87/skia,TeamExodus/external_skia,Jichao/skia,PAC-ROM/android_external_skia,HalCanary/skia-hc,MonkeyZZZZ/platform_external_skia,Hikari-no-Tenshi/android_external_skia,qrealka/skia-hc,HalCanary/skia-hc,ominux/skia,MonkeyZZZZ/platform_external_skia,Jichao/skia,TeamExodus/external_skia,BrokenROM/external_skia,Igalia/skia,nfxosp/platform_external_skia,vanish87/skia,aosp-mirror/platform_external_skia,w3nd1go/android_external_skia,pcwalton/skia,AOSPB/external_skia,BrokenROM/external_skia,Jichao/skia,boulzordev/android_external_skia,MinimalOS-AOSP/platform_external_skia,AOSPB/external_skia,MonkeyZZZZ/platform_external_skia,VRToxin-AOSP/android_external_skia,samuelig/skia,TeamTwisted/external_skia,DiamondLovesYou/skia-sys,jtg-gg/skia,boulzordev/android_external_skia,MonkeyZZZZ/platform_external_skia,timduru/platform-external-skia,MarshedOut/android_external_skia,MonkeyZZZZ/platform_external_skia,DiamondLovesYou/skia-sys,AOSPB/external_skia,Infinitive-OS/platform_external_skia,OneRom/external_skia,samuelig/skia,tmpvar/skia.cc,boulzordev/android_external_skia,qrealka/skia-hc,OneRom/external_skia,VRToxin-AOSP/android_external_skia,AOSP-YU/platform_external_skia,Infinitive-OS/platform_external_skia,samuelig/skia,ominux/skia,YUPlayGodDev/platform_external_skia,UBERMALLOW/external_skia,tmpvar/skia.cc,google/skia,rubenvb/skia,OneRom/external_skia,spezi77/android_external_skia,AOSPB/external_skia