tree 6c2382c4cfe0475ecbfafc1af981dcaa0a801c35
parent d834d55f902ccd18cba85f93ecf51e30c5e7e47b
author Tom Sepez <tsepez@chromium.org> 1453843226 -0800
committer Tom Sepez <tsepez@chromium.org> 1453843226 -0800

Merge to XFA: War on #defines, part 1.

Contains additional XFA-specific changes.

Original Review URL: https://codereview.chromium.org/1632143002 .
(cherry picked from commit 66a9dc9dd65ed2b9c7ede448d046b770140f16d5)

R=thestig@chromium.org

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