Index: ui/webui/resources/js/parse_html_subset.js |
diff --git a/ui/webui/resources/js/parse_html_subset.js b/ui/webui/resources/js/parse_html_subset.js |
index c49d8fca89b47286c7e1927f741d5719ceb915b9..7262d0e9f9c9707654eaff189d27966967d7f515 100644 |
--- a/ui/webui/resources/js/parse_html_subset.js |
+++ b/ui/webui/resources/js/parse_html_subset.js |
@@ -37,7 +37,8 @@ var parseHtmlSubset = (function() { |
*/ |
var allowedTags = ['A', 'B', 'STRONG']; |
- function merge() { |
+ /** @param {...Object} var_args Objects to merge. */ |
+ function merge(var_args) { |
var clone = {}; |
for (var i = 0; i < arguments.length; ++i) { |
if (typeof arguments[i] == 'object') { |