Revert of Revert of moar ws (patchset #1 id:1 of https://codereview.chromium.org/518333002/)
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

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

Author: mtklein@google.com

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

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