Fix a regression with cut off images.

This regressed in commit 3f41851 due to shadow variables.

BUG=478164
R=tsepez@chromium.org

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

(cherry picked from commit 97d10aff654e42c1b7c3d2abf33fbcf8d341799e)

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