X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fui%2Fwebui%2Fresources%2Fjs%2Fparse_html_subset.js;h=7262d0e9f9c9707654eaff189d27966967d7f515;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=c49d8fca89b47286c7e1927f741d5719ceb915b9;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

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
--- 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') {