Index: ui/login/resource_loader.js |
diff --git a/ui/login/resource_loader.js b/ui/login/resource_loader.js |
index 4eb6cf302b040518ebc43c1569c072ed08f5bce3..56a68353cf9dbf8aefbcdcaf98813a207ca0817a 100644 |
--- a/ui/login/resource_loader.js |
+++ b/ui/login/resource_loader.js |
@@ -195,16 +195,18 @@ cr.define('cr.ui.login.ResourceLoader', function() { |
function loadAssetsOnIdle(id, callback, opt_idleTimeoutMs) { |
opt_idleTimeoutMs = opt_idleTimeoutMs || 250; |
- let loadOnIdle = function() { |
+ var loadOnIdle = function() { |
window.requestIdleCallback(function() { |
loadAssets(id, callback); |
}, { timeout: opt_idleTimeoutMs }); |
}; |
- if (document.readyState == 'complete') { |
- loadOnIdle(); |
- } else { |
+ if (document.readyState == 'loading') { |
window.addEventListener('DOMContentLoaded', loadOnIdle); |
+ } else { |
+ // DOMContentLoaded has already been called if document.readyState is |
+ // 'interactive' or 'complete', so invoke the callback immediately. |
+ loadOnIdle(); |
} |
} |