Revert of Revert of Revert of Revert of Revert of moar ws (patchset #1 id:1 of https://codereview.chromium.org/523413002/)
Revert of Revert of Revert of Revert of Revert of moar ws (patchset #1 id:1 of https://codereview.chromium.org/523413002/)

Reason for revert:
ws

Original issue's description:
> Revert of Revert of Revert of Revert of moar ws (patchset #1 id:1 of https://codereview.chromium.org/519303002/)
>
> Reason for revert:
> ws
>
> Original issue's description:
> > Revert of Revert of Revert of moar ws (patchset #1 id:1 of https://codereview.chromium.org/520023003/)
> >
> > Reason for revert:
> > spring break forever
> >
> > Original issue's description:
> > > Revert of Revert of moar ws (patchset #1 id:1 of https://codereview.chromium.org/518333002/)
> > >
> > > Reason for revert:
> > > nah
> > >
> > > Original issue's description:
> > > > Revert of moar ws (patchset #1 id:1 of https://codereview.chromium.org/518233004/)
> > > >
> > > > Reason for revert:
> > > > i like the old file better
> > > >
> > > > Original issue's description:
> > > > > moar ws
> > > > >
> > > > > BUG=skia:
> > > > >
> > > > > Committed: https://skia.googlesource.com/skia/+/7a353e9
> > > >
> > > > TBR=mtklein@chromium.org
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=skia:
> > > >
> > > > Committed: https://skia.googlesource.com/skia/+/4ee3e529e2756275a978ae5e4763955a703191f2
> > >
> > > TBR=mtklein@chromium.org
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=skia:
> > >
> > > Committed: https://skia.googlesource.com/skia/+/5355536c790831f05cdd37a0ac84206ad1c3dc56
> >
> > TBR=mtklein@chromium.org
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=skia:
> >
> > Committed: https://skia.googlesource.com/skia/+/2fe2ce41e3e5647c7aead4d76d75f5500f573fde
>
> TBR=mtklein@chromium.org
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/c7bee661a1e2b2f3b367bdd2b4176d1921aa69d4

R=mtklein@chromium.org
TBR=mtklein@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: mtklein@google.com

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

FusionSP/external_chromium_org_third_party_skia,MonkeyZZZZ/platform_external_skia,nfxosp/platform_external_skia,pcwalton/skia,vanish87/skia,chenlian2015/skia_from_google,BrokenROM/external_skia,android-ia/platform_external_chromium_org_third_party_skia,geekboxzone/lollipop_external_chromium_org_third_party_skia,todotodoo/skia,samuelig/skia,nvoron23/skia,ench0/external_chromium_org_third_party_skia,tmpvar/skia.cc,amyvmiwei/skia,MinimalOS/android_external_chromium_org_third_party_skia,MarshedOut/android_external_skia,Hikari-no-Tenshi/android_external_skia,chenlian2015/skia_from_google,MinimalOS-AOSP/platform_external_skia,MonkeyZZZZ/platform_external_skia,TeamExodus/external_skia,VRToxin-AOSP/android_external_skia,UBERMALLOW/external_skia,MonkeyZZZZ/platform_external_skia,mydongistiny/external_chromium_org_third_party_skia,Omegaphora/external_chromium_org_third_party_skia,PAC-ROM/android_external_skia,Infinitive-OS/platform_external_skia,samuelig/skia,w3nd1go/android_external_skia,AOSPB/external_skia,rubenvb/skia,scroggo/skia,google/skia,ominux/skia,MarshedOut/android_external_skia,nfxosp/platform_external_skia,Hikari-no-Tenshi/android_external_skia,MinimalOS-AOSP/platform_external_skia,PAC-ROM/android_external_skia,Hikari-no-Tenshi/android_external_skia,Jichao/skia,UBERMALLOW/external_skia,VRToxin-AOSP/android_external_skia,Omegaphora/external_chromium_org_third_party_skia,TeamTwisted/external_skia,MarshedOut/android_external_skia,ench0/external_chromium_org_third_party_skia,Jichao/skia,mydongistiny/external_chromium_org_third_party_skia,tmpvar/skia.cc,nfxosp/platform_external_skia,DARKPOP/external_chromium_org_third_party_skia,samuelig/skia,MonkeyZZZZ/platform_external_skia,boulzordev/android_external_skia,MIPS/external-chromium_org-third_party-skia,FusionSP/external_chromium_org_third_party_skia,timduru/platform-external-skia,MIPS/external-chromium_org-third_party-skia,VRToxin-AOSP/android_external_skia,MinimalOS/external_chromium_org_third_party_skia,Igalia/skia,Igalia/skia,vanish87/skia,geekboxzone/mmallow_external_skia,AOSP-YU/platform_external_skia,timduru/platform-external-skia,MonkeyZZZZ/platform_external_skia,DiamondLovesYou/skia-sys,TeamTwisted/external_skia,spezi77/android_external_skia,invisiblek/android_external_skia,Infinitive-OS/platform_external_skia,Omegaphora/external_chromium_org_third_party_skia,noselhq/skia,rubenvb/skia,tmpvar/skia.cc,DiamondLovesYou/skia-sys,VRToxin-AOSP/android_external_skia,scroggo/skia,invisiblek/android_external_skia,MIPS/external-chromium_org-third_party-skia,Igalia/skia,ominux/skia,MonkeyZZZZ/platform_external_skia,jtg-gg/skia,tmpvar/skia.cc,w3nd1go/android_external_skia,todotodoo/skia,vanish87/skia,Fusion-Rom/external_chromium_org_third_party_skia,nfxosp/platform_external_skia,shahrzadmn/skia,google/skia,boulzordev/android_external_skia,VRToxin-AOSP/android_external_skia,boulzordev/android_external_skia,FusionSP/external_chromium_org_third_party_skia,nvoron23/skia,TeamTwisted/external_skia,Hikari-no-Tenshi/android_external_skia,mydongistiny/external_chromium_org_third_party_skia,pcwalton/skia,HalCanary/skia-hc,qrealka/skia-hc,shahrzadmn/skia,FusionSP/external_chromium_org_third_party_skia,geekboxzone/lollipop_external_chromium_org_third_party_skia,VRToxin-AOSP/android_external_skia,Fusion-Rom/external_chromium_org_third_party_skia,qrealka/skia-hc,Infinitive-OS/platform_external_skia,ench0/external_chromium_org_third_party_skia,UBERMALLOW/external_skia,UBERMALLOW/external_skia,ominux/skia,Infinitive-OS/platform_external_skia,geekboxzone/lollipop_external_chromium_org_third_party_skia,AOSPB/external_skia,rubenvb/skia,todotodoo/skia,Omegaphora/external_chromium_org_third_party_skia,MinimalOS/android_external_chromium_org_third_party_skia,timduru/platform-external-skia,scroggo/skia,samuelig/skia,android-ia/platform_external_chromium_org_third_party_skia,ominux/skia,OneRom/external_skia,android-ia/platform_external_chromium_org_third_party_skia,MinimalOS/external_chromium_org_third_party_skia,qrealka/skia-hc,Omegaphora/external_chromium_org_third_party_skia,OptiPop/external_chromium_org_third_party_skia,TeamTwisted/external_skia,OptiPop/external_chromium_org_third_party_skia,OptiPop/external_chromium_org_third_party_skia,nvoron23/skia,Infinitive-OS/platform_external_skia,MIPS/external-chromium_org-third_party-skia,pcwalton/skia,DiamondLovesYou/skia-sys,aosp-mirror/platform_external_skia,OneRom/external_skia,noselhq/skia,TeamExodus/external_skia,AOSPB/external_skia,OneRom/external_skia,geekboxzone/mmallow_external_skia,TeamExodus/external_skia,w3nd1go/android_external_skia,DARKPOP/external_chromium_org_third_party_skia,MinimalOS/android_external_chromium_org_third_party_skia,nfxosp/platform_external_skia,w3nd1go/android_external_skia,pcwalton/skia,tmpvar/skia.cc,Jichao/skia,jtg-gg/skia,jtg-gg/skia,YUPlayGodDev/platform_external_skia,google/skia,AOSP-YU/platform_external_skia,amyvmiwei/skia,AOSPB/external_skia,HalCanary/skia-hc,samuelig/skia,qrealka/skia-hc,MarshedOut/android_external_skia,FusionSP/external_chromium_org_third_party_skia,google/skia,Infinitive-OS/platform_external_skia,vanish87/skia,pcwalton/skia,geekboxzone/lollipop_external_chromium_org_third_party_skia,TeamEOS/external_chromium_org_third_party_skia,MinimalOS/external_chromium_org_third_party_skia,noselhq/skia,BrokenROM/external_skia,MinimalOS/external_chromium_org_third_party_skia,geekboxzone/mmallow_external_skia,geekboxzone/mmallow_external_skia,HalCanary/skia-hc,ench0/external_chromium_org_third_party_skia,HalCanary/skia-hc,aosp-mirror/platform_external_skia,Jichao/skia,shahrzadmn/skia,nvoron23/skia,MIPS/external-chromium_org-third_party-skia,Fusion-Rom/external_chromium_org_third_party_skia,todotodoo/skia,ominux/skia,TeamEOS/external_chromium_org_third_party_skia,AOSP-YU/platform_external_skia,ench0/external_chromium_org_third_party_skia,timduru/platform-external-skia,Jichao/skia,ominux/skia,android-ia/platform_external_chromium_org_third_party_skia,nfxosp/platform_external_skia,timduru/platform-external-skia,MyAOSP/external_chromium_org_third_party_skia,VRToxin-AOSP/android_external_skia,Igalia/skia,scroggo/skia,geekboxzone/lollipop_external_chromium_org_third_party_skia,amyvmiwei/skia,todotodoo/skia,HalCanary/skia-hc,MyAOSP/external_chromium_org_third_party_skia,OptiPop/external_chromium_org_third_party_skia,TeamExodus/external_skia,spezi77/android_external_skia,MyAOSP/external_chromium_org_third_party_skia,aosp-mirror/platform_external_skia,UBERMALLOW/external_skia,YUPlayGodDev/platform_external_skia,FusionSP/external_chromium_org_third_party_skia,scroggo/skia,rubenvb/skia,AOSPB/external_skia,spezi77/android_external_skia,spezi77/android_external_skia,DARKPOP/external_chromium_org_third_party_skia,nvoron23/skia,mydongistiny/external_chromium_org_third_party_skia,noselhq/skia,mydongistiny/external_chromium_org_third_party_skia,mydongistiny/external_chromium_org_third_party_skia,HalCanary/skia-hc,rubenvb/skia,spezi77/android_external_skia,FusionSP/external_chromium_org_third_party_skia,boulzordev/android_external_skia,MinimalOS/android_external_chromium_org_third_party_skia,DARKPOP/external_chromium_org_third_party_skia,OptiPop/external_chromium_org_third_party_skia,ench0/external_chromium_org_third_party_skia,DiamondLovesYou/skia-sys,Igalia/skia,MinimalOS/external_chromium_org_third_party_skia,TeamExodus/external_skia,MinimalOS-AOSP/platform_external_skia,aosp-mirror/platform_external_skia,amyvmiwei/skia,android-ia/platform_external_chromium_org_third_party_skia,geekboxzone/mmallow_external_skia,geekboxzone/lollipop_external_chromium_org_third_party_skia,DiamondLovesYou/skia-sys,samuelig/skia,Jichao/skia,FusionSP/external_chromium_org_third_party_skia,Omegaphora/external_chromium_org_third_party_skia,ominux/skia,PAC-ROM/android_external_skia,AOSPB/external_skia,PAC-ROM/android_external_skia,invisiblek/android_external_skia,MIPS/external-chromium_org-third_party-skia,AOSP-YU/platform_external_skia,HalCanary/skia-hc,boulzordev/android_external_skia,Jichao/skia,MinimalOS/external_chromium_org_third_party_skia,google/skia,PAC-ROM/android_external_skia,DiamondLovesYou/skia-sys,Igalia/skia,noselhq/skia,amyvmiwei/skia,vanish87/skia,TeamEOS/external_chromium_org_third_party_skia,shahrzadmn/skia,invisiblek/android_external_skia,pcwalton/skia,todotodoo/skia,BrokenROM/external_skia,MinimalOS-AOSP/platform_external_skia,rubenvb/skia,chenlian2015/skia_from_google,Infinitive-OS/platform_external_skia,MinimalOS/android_external_chromium_org_third_party_skia,qrealka/skia-hc,Omegaphora/external_chromium_org_third_party_skia,AOSPB/external_skia,HalCanary/skia-hc,OneRom/external_skia,OneRom/external_skia,mydongistiny/external_chromium_org_third_party_skia,YUPlayGodDev/platform_external_skia,UBERMALLOW/external_skia,nfxosp/platform_external_skia,UBERMALLOW/external_skia,HalCanary/skia-hc,jtg-gg/skia,amyvmiwei/skia,boulzordev/android_external_skia,MinimalOS-AOSP/platform_external_skia,TeamExodus/external_skia,shahrzadmn/skia,geekboxzone/mmallow_external_skia,OptiPop/external_chromium_org_third_party_skia,PAC-ROM/android_external_skia,MyAOSP/external_chromium_org_third_party_skia,google/skia,BrokenROM/external_skia,geekboxzone/mmallow_external_skia,TeamTwisted/external_skia,android-ia/platform_external_chromium_org_third_party_skia,aosp-mirror/platform_external_skia,rubenvb/skia,TeamEOS/external_chromium_org_third_party_skia,ominux/skia,invisiblek/android_external_skia,chenlian2015/skia_from_google,Jichao/skia,vanish87/skia,shahrzadmn/skia,tmpvar/skia.cc,BrokenROM/external_skia,w3nd1go/android_external_skia,android-ia/platform_external_chromium_org_third_party_skia,YUPlayGodDev/platform_external_skia,google/skia,MarshedOut/android_external_skia,invisiblek/android_external_skia,nvoron23/skia,Hikari-no-Tenshi/android_external_skia,mydongistiny/external_chromium_org_third_party_skia,aosp-mirror/platform_external_skia,chenlian2015/skia_from_google,MIPS/external-chromium_org-third_party-skia,MinimalOS-AOSP/platform_external_skia,BrokenROM/external_skia,YUPlayGodDev/platform_external_skia,MarshedOut/android_external_skia,UBERMALLOW/external_skia,PAC-ROM/android_external_skia,Fusion-Rom/external_chromium_org_third_party_skia,tmpvar/skia.cc,noselhq/skia,Fusion-Rom/external_chromium_org_third_party_skia,vanish87/skia,scroggo/skia,ench0/external_chromium_org_third_party_skia,DARKPOP/external_chromium_org_third_party_skia,MonkeyZZZZ/platform_external_skia,Infinitive-OS/platform_external_skia,samuelig/skia,OneRom/external_skia,boulzordev/android_external_skia,noselhq/skia,MIPS/external-chromium_org-third_party-skia,scroggo/skia,OneRom/external_skia,MyAOSP/external_chromium_org_third_party_skia,rubenvb/skia,chenlian2015/skia_from_google,pcwalton/skia,shahrzadmn/skia,invisiblek/android_external_skia,TeamTwisted/external_skia,OptiPop/external_chromium_org_third_party_skia,geekboxzone/mmallow_external_skia,TeamEOS/external_chromium_org_third_party_skia,pcwalton/skia,aosp-mirror/platform_external_skia,OneRom/external_skia,MyAOSP/external_chromium_org_third_party_skia,google/skia,qrealka/skia-hc,shahrzadmn/skia,MinimalOS-AOSP/platform_external_skia,pcwalton/skia,DiamondLovesYou/skia-sys,DARKPOP/external_chromium_org_third_party_skia,amyvmiwei/skia,tmpvar/skia.cc,MinimalOS-AOSP/platform_external_skia,aosp-mirror/platform_external_skia,chenlian2015/skia_from_google,aosp-mirror/platform_external_skia,TeamEOS/external_chromium_org_third_party_skia,rubenvb/skia,Hikari-no-Tenshi/android_external_skia,w3nd1go/android_external_skia,todotodoo/skia,aosp-mirror/platform_external_skia,jtg-gg/skia,TeamTwisted/external_skia,AOSP-YU/platform_external_skia,ominux/skia,w3nd1go/android_external_skia,Fusion-Rom/external_chromium_org_third_party_skia,geekboxzone/lollipop_external_chromium_org_third_party_skia,TeamEOS/external_chromium_org_third_party_skia,YUPlayGodDev/platform_external_skia,android-ia/platform_external_chromium_org_third_party_skia,boulzordev/android_external_skia,noselhq/skia,DARKPOP/external_chromium_org_third_party_skia,AOSP-YU/platform_external_skia,shahrzadmn/skia,noselhq/skia,Hikari-no-Tenshi/android_external_skia,HalCanary/skia-hc,UBERMALLOW/external_skia,amyvmiwei/skia,jtg-gg/skia,YUPlayGodDev/platform_external_skia,MinimalOS-AOSP/platform_external_skia,Infinitive-OS/platform_external_skia,MinimalOS/android_external_chromium_org_third_party_skia,MarshedOut/android_external_skia,nvoron23/skia,AOSPB/external_skia,MonkeyZZZZ/platform_external_skia,Fusion-Rom/external_chromium_org_third_party_skia,invisiblek/android_external_skia,nvoron23/skia,nfxosp/platform_external_skia,VRToxin-AOSP/android_external_skia,qrealka/skia-hc,BrokenROM/external_skia,MinimalOS/external_chromium_org_third_party_skia,ench0/external_chromium_org_third_party_skia,w3nd1go/android_external_skia,todotodoo/skia,google/skia,Fusion-Rom/external_chromium_org_third_party_skia,AOSP-YU/platform_external_skia,PAC-ROM/android_external_skia,nvoron23/skia,AOSP-YU/platform_external_skia,Igalia/skia,TeamExodus/external_skia,timduru/platform-external-skia,todotodoo/skia,vanish87/skia,TeamTwisted/external_skia,tmpvar/skia.cc,Jichao/skia,jtg-gg/skia,TeamTwisted/external_skia,MonkeyZZZZ/platform_external_skia,AOSPB/external_skia,PAC-ROM/android_external_skia,AOSP-YU/platform_external_skia,TeamExodus/external_skia,boulzordev/android_external_skia,spezi77/android_external_skia,Hikari-no-Tenshi/android_external_skia,rubenvb/skia,Omegaphora/external_chromium_org_third_party_skia,w3nd1go/android_external_skia,BrokenROM/external_skia,MyAOSP/external_chromium_org_third_party_skia,MarshedOut/android_external_skia,YUPlayGodDev/platform_external_skia,DARKPOP/external_chromium_org_third_party_skia,MinimalOS/android_external_chromium_org_third_party_skia,TeamEOS/external_chromium_org_third_party_skia,OptiPop/external_chromium_org_third_party_skia,nfxosp/platform_external_skia,timduru/platform-external-skia,TeamExodus/external_skia,samuelig/skia,scroggo/skia,geekboxzone/mmallow_external_skia,qrealka/skia-hc,MinimalOS/external_chromium_org_third_party_skia,OneRom/external_skia,vanish87/skia,Igalia/skia,MarshedOut/android_external_skia,google/skia,YUPlayGodDev/platform_external_skia,geekboxzone/lollipop_external_chromium_org_third_party_skia,MinimalOS/android_external_chromium_org_third_party_skia,VRToxin-AOSP/android_external_skia,MyAOSP/external_chromium_org_third_party_skia