Fix variable shadowing and unreachable code that it caused
Fix variable shadowing and unreachable code that it caused

Change https://codereview.chromium.org/1261643004 renamed a function
parameter so that some code became unreachable. This renames that
parameter back.

R=bsalomon@google.com
BUG=skia:4169

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

vanish87/skia,todotodoo/skia,shahrzadmn/skia,vanish87/skia,nvoron23/skia,rubenvb/skia,qrealka/skia-hc,shahrzadmn/skia,vanish87/skia,qrealka/skia-hc,aosp-mirror/platform_external_skia,HalCanary/skia-hc,google/skia,aosp-mirror/platform_external_skia,shahrzadmn/skia,shahrzadmn/skia,Hikari-no-Tenshi/android_external_skia,nvoron23/skia,noselhq/skia,google/skia,shahrzadmn/skia,ominux/skia,tmpvar/skia.cc,tmpvar/skia.cc,aosp-mirror/platform_external_skia,tmpvar/skia.cc,rubenvb/skia,aosp-mirror/platform_external_skia,google/skia,nvoron23/skia,google/skia,Hikari-no-Tenshi/android_external_skia,todotodoo/skia,ominux/skia,google/skia,aosp-mirror/platform_external_skia,ominux/skia,todotodoo/skia,ominux/skia,todotodoo/skia,aosp-mirror/platform_external_skia,todotodoo/skia,tmpvar/skia.cc,tmpvar/skia.cc,noselhq/skia,noselhq/skia,tmpvar/skia.cc,ominux/skia,shahrzadmn/skia,google/skia,todotodoo/skia,shahrzadmn/skia,rubenvb/skia,nvoron23/skia,HalCanary/skia-hc,todotodoo/skia,HalCanary/skia-hc,qrealka/skia-hc,Hikari-no-Tenshi/android_external_skia,vanish87/skia,ominux/skia,Hikari-no-Tenshi/android_external_skia,rubenvb/skia,tmpvar/skia.cc,noselhq/skia,HalCanary/skia-hc,vanish87/skia,HalCanary/skia-hc,noselhq/skia,google/skia,todotodoo/skia,HalCanary/skia-hc,qrealka/skia-hc,vanish87/skia,noselhq/skia,nvoron23/skia,google/skia,noselhq/skia,HalCanary/skia-hc,Hikari-no-Tenshi/android_external_skia,rubenvb/skia,Hikari-no-Tenshi/android_external_skia,qrealka/skia-hc,nvoron23/skia,google/skia,aosp-mirror/platform_external_skia,vanish87/skia,qrealka/skia-hc,aosp-mirror/platform_external_skia,rubenvb/skia,vanish87/skia,tmpvar/skia.cc,rubenvb/skia,HalCanary/skia-hc,qrealka/skia-hc,HalCanary/skia-hc,Hikari-no-Tenshi/android_external_skia,rubenvb/skia,aosp-mirror/platform_external_skia,nvoron23/skia,HalCanary/skia-hc,shahrzadmn/skia,nvoron23/skia,qrealka/skia-hc,ominux/skia,Hikari-no-Tenshi/android_external_skia,ominux/skia,rubenvb/skia,rubenvb/skia,vanish87/skia,shahrzadmn/skia,google/skia,tmpvar/skia.cc,ominux/skia,nvoron23/skia,todotodoo/skia,noselhq/skia,aosp-mirror/platform_external_skia,noselhq/skia