GitLab

The order of operations changed in crrev.com/505494 with C++14
constexpr optimizations. However, that change appears to have regressed
performance in some cases. So, this CL tweaks the code to match the
old structure and trigger the same compiler optimization heuristics.

Bug: 770832
Change-Id: I28f57ddf53825619eb73c9a92c663fc8463e16a7
Reviewed-on: https://chromium-review.googlesource.com/696721Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Justin Schuh <jschuh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506078}