Fix layer hoisting bug in SkCanvas::drawPicture path
Fix layer hoisting bug in SkCanvas::drawPicture path

Most of this CL is just reordering to better match the MultiPictureDraw variant. The only functional change is that we now use the device space bounds as the queryRect to the layer hoisting code. This is necessary since the layer hoisting does all its work in device space.

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

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