Allow IDL schemas to have comments on callback functions

tools/json_schema_compiler/idl_schema.py

 #! /usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import itertools
 import json
 import os.path
 import re
 import sys
@@ skipping 39 matching lines @@
   Returns: A tuple that looks like:
     (
       "The processed comment, minus all |parameter| mentions.",
       {
         'parameter_name_1': "The comment that followed |parameter_name_1|:",
         ...
       }
     )
   '''
   # Find all the parameter comments of the form '|name|: comment'.
-  parameter_starts = list(re.finditer(r'\n *\|([^|]*)\| *: *', comment))
+  parameter_starts = list(re.finditer(r' *\|([^|]*)\| *: *', comment))
 
   # Get the parent comment (everything before the first parameter comment.
   first_parameter_location = (parameter_starts[0].start()
                               if parameter_starts else len(comment))
   parent_comment = comment[:first_parameter_location]
 
   # We replace \n\n with <br/><br/> here and below, because the documentation
   # needs to know where the newlines should be, and this is easier than
   # escaping \n.
   parent_comment = (parent_comment.strip().replace('\n\n', '<br/><br/>')
@@ skipping 151 matching lines @@
       instance_of = self.parent.GetProperty('instanceOf')
       if instance_of:
         properties['isInstanceOf'] = instance_of
     elif self.typeref == 'ArrayBuffer':
       properties['type'] = 'binary'
       properties['isInstanceOf'] = 'ArrayBuffer'
     elif self.typeref is None:
       properties['type'] = 'function'
     else:
       if self.typeref in callbacks:
+        # Do not override name and description if they are already specified.
+        name = properties.get('name', None)
+        description = properties.get('description', None)
         properties.update(callbacks[self.typeref])
+        if description is not None:
+          properties['description'] = description
+        if name is not None:
+          properties['name'] = name
       else:
         properties['$ref'] = self.typeref
-
     return result
 
 
 class Enum(object):
   '''
   Given an IDL Enum node, converts into a Python dictionary that the JSON
   schema compiler expects to see.
   '''
   def __init__(self, enum_node):
     self.node = enum_node
@@ skipping 121 matching lines @@
   '''
   Dump a json serialization of parse result for the IDL files whose names
   were passed in on the command line.
   '''
   for filename in sys.argv[1:]:
     schema = Load(filename)
     print json.dumps(schema, indent=2)
 
 if __name__ == '__main__':
   Main()