The User Timing shim causes errors in requirejs applications when the proper User Timing API exists. This is because the script erroneously returns when the API exists, causing the requirejs loader at the end of the script to not execute.

David, would you review my shared JS code change here?

Comment on attachment 8557508 [details] Link to Github pull-request: https://github.com/mozilla-b2g/gaia/pull/27832 Looks good to me. Thanks for explaining that it was just a 1-line diff with indentation changes. Too bad that github isn't better at detecting that.

Try run: https://treeherder.mozilla.org/#/jobs?repo=gaia-try&revision=c8959b65144d In master: https://github.com/mozilla-b2g/gaia/commit/ff2966f58ba7d887322448f64c6d604f92acb686

Comment on attachment 8557508 [details] Link to Github pull-request: https://github.com/mozilla-b2g/gaia/pull/27832 Need to land this in v2.2 *before* User Timing so that User Timing landing will not cause Gaia test failures. [Bug caused by] (feature/regressing bug #): 782751 [User impact] if declined: no performance testing using Raptor on v2.2 [Testing completed]: this patch is for test code [Risk to taking this patch] (and alternatives if risky): low, this patch fixes an error in capturing performance marks and measures [String changes made]: n/a

v2.2: https://github.com/mozilla-b2g/gaia/commit/6a58c433c53c25e96e067a9b38bf1cc17307d5b2