tree d5fb90ecb9ba8e01e1ba45711fce046cc02049c6
parent 3cc55de355d2eea165cf5981f1b0f83a118ae9c4
author Lei Zhang <thestig@chromium.org> 1430946024 -0700
committer Lei Zhang <thestig@chromium.org> 1430946024 -0700

Merge to XFA: 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/1127163003