This should help WebKit avoid needing to apply a local patch.
Also clean up the style in this file a bit.

BUG=angleproject:307,angleproject:992

Change-Id: I6328cd03901dbf52eccddc7c747a684ed9b23ea1
Reviewed-on: https://chromium-review.googlesource.com/268741Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>