summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhawkins <jhawkins@chromium.org>2015-06-11 11:38:34 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-11 18:39:23 +0000
commitf714e984a988e6f546516f3bb48af5156107334e (patch)
tree07af8ac787926d068bba65f7002287f45f3e9797
parent9c6bcf714a44413a5bf00a4cd346197d854464e6 (diff)
downloadchromium_src-f714e984a988e6f546516f3bb48af5156107334e.zip
chromium_src-f714e984a988e6f546516f3bb48af5156107334e.tar.gz
chromium_src-f714e984a988e6f546516f3bb48af5156107334e.tar.bz2
jscompiler: Fix issues in the compiler test introduced by crrev.com/333868
R=dbeam@chromium.org BUG=none Review URL: https://codereview.chromium.org/1178883005 Cr-Commit-Position: refs/heads/master@{#333994}
-rwxr-xr-xthird_party/closure_compiler/compiler_test.py5
-rw-r--r--ui/webui/resources/js/cr.js3
2 files changed, 6 insertions, 2 deletions
diff --git a/third_party/closure_compiler/compiler_test.py b/third_party/closure_compiler/compiler_test.py
index a39776a..d1ff08e 100755
--- a/third_party/closure_compiler/compiler_test.py
+++ b/third_party/closure_compiler/compiler_test.py
@@ -20,6 +20,8 @@ _CR_UI_JS = os.path.join(_RESOURCES_DIR, "cr", "ui.js")
_POLYMER_EXTERNS = os.path.join(_SRC_DIR, "third_party", "polymer", "v1_0",
"components-chromium", "polymer-externs",
"polymer.externs.js")
+_CHROME_SEND_EXTERNS = os.path.join(_SRC_DIR, "third_party", "closure_compiler",
+ "externs", "chrome_send_externs.js")
class CompilerTest(unittest.TestCase):
@@ -41,8 +43,9 @@ class CompilerTest(unittest.TestCase):
FileCache._cache[file_path] = source_code
out_file, out_map = self._createOutFiles()
+ externs = [_POLYMER_EXTERNS, _CHROME_SEND_EXTERNS]
found_errors, stderr = self._checker.check(file_path,
- externs=[_POLYMER_EXTERNS],
+ externs=externs,
out_file=out_file,
output_wrapper=output_wrapper)
return found_errors, stderr, out_file, out_map
diff --git a/ui/webui/resources/js/cr.js b/ui/webui/resources/js/cr.js
index d3503b8..cc6301c 100644
--- a/ui/webui/resources/js/cr.js
+++ b/ui/webui/resources/js/cr.js
@@ -375,7 +375,8 @@ var cr = function() {
*/
function webUIListenerCallback(event) {
var listenerCallbacks = webUIListenerMap.get(event);
- for (var callback of listenerCallbacks) {
+ for (var i = 0; i < listenerCallbacks.length; i++) {
+ var callback = listenerCallbacks[i];
callback.apply(null, Array.prototype.slice.call(arguments, 1));
}
}