Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / ui / webui / resources / js / parse_html_subset.js

diff --git a/src/ui/webui/resources/js/parse_html_subset.js b/src/ui/webui/resources/js/parse_html_subset.js
index c49d8fc..7262d0e 100644 (file)
--- a/src/ui/webui/resources/js/parse_html_subset.js
+++ b/src/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') {