Roll IDL to multivm@1467

core/inspector/CodeGeneratorInstrumentation.py

 #!/usr/bin/env python
 # Copyright (c) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 243 matching lines @@
 
         for param in self.params:
             if "DefaultReturn" in param.options:
                 self.default_return_value = param.name
 
         self.params_impl = self.params
         if not self.accepts_cookie and not "Inline=Forward" in self.options:
             if not "Keep" in self.params_impl[0].options:
                 self.params_impl = self.params_impl[1:]
             self.params_impl = [Parameter("InstrumentingAgents* agents")] + self.params_impl
-            self.agents_selector_class = re.match("(\w*)", self.params[0].type).group(1)
 
         self.agents = filter(lambda option: not "=" in option, self.options)
 
     def generate_header(self, header_lines):
         if "Inline=Custom" in self.options:
             return
 
         header_lines.append("%s %sImpl(%s);" % (
             self.return_type, self.name, ", ".join(map(Parameter.to_str_class, self.params_impl))))
 
         if "Inline=FastReturn" in self.options or "Inline=Forward" in self.options:
             fast_return = "\n    FAST_RETURN_IF_NO_FRONTENDS(%s);" % self.default_return_value
         else:
             fast_return = ""
 
         for param in self.params:
             if "FastReturn" in param.options:
                 fast_return += "\n    if (!%s)\n        return %s;" % (param.name, self.default_return_value)
 
         if self.accepts_cookie:
             condition = "%s.isValid()" % self.params_impl[0].name
             template = template_inline
         elif "Inline=Forward" in self.options:
             condition = ""
             template = template_inline_forward
         else:
-            condition = "InstrumentingAgents* agents = instrumentingAgentsFor%s(%s)" % (
-                self.agents_selector_class, self.params[0].name)
+            condition = "InstrumentingAgents* agents = instrumentingAgentsFor(%s)" % self.params[0].name
 
             if self.returns_value:
                 template = template_inline_returns_value
             else:
                 template = template_inline
 
         header_lines.append(template.substitute(
             None,
             name=self.name,
             fast_return=fast_return,
@@ skipping 212 matching lines @@
     if not output_dirpath:
         raise Exception("Output directory must be specified")
 except Exception:
     # Work with python 2 and 3 http://docs.python.org/py3k/howto/pyporting.html
     exc = sys.exc_info()[1]
     sys.stderr.write("Failed to parse command-line arguments: %s\n\n" % exc)
     sys.stderr.write("Usage: <script> --output_dir <output_dir> InspectorInstrumentation.idl\n")
     exit(1)
 
 generate(input_path, output_dirpath)