rollback problem blink merge cl

tools/dom/scripts/systemnative.py

 #!/usr/bin/python
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 """This module provides shared functionality for the systems to generate
 native binding from the IDL database."""
 
 import emitter
 import os
@@ skipping 75 matching lines @@
     for (type, member) in _cpp_overloaded_callback_map.keys():
       if type not in _cpp_partial_map:
         _cpp_partial_map[type] = set([])
       _cpp_partial_map[type].add(_cpp_overloaded_callback_map[(type, member)])
 
   if interface_name in _cpp_partial_map:
     return _cpp_partial_map[interface_name]
   else:
     return set([])
 
-def array_type(data_type):
-    matched = re.match(r'([\w\d_\s]+)\[\]', data_type)
-    if not matched:
-        return None
-    return matched.group(1)
-
 def _GetCPPTypeName(interface_name, callback_name, cpp_name):
   # TODO(vsm): We need to track the original IDL file name in order to recover
   # the proper CPP name.
 
   cpp_tuple = (interface_name, callback_name)
   if cpp_tuple in _cpp_callback_map:
     cpp_type_name = _cpp_callback_map[cpp_tuple]
   elif (interface_name, cpp_name) in _cpp_overloaded_callback_map:
     cpp_type_name = _cpp_overloaded_callback_map[(interface_name, cpp_name)]
   else:
@@ skipping 601 matching lines @@
                                  ext_attrs.get('ConstructorCallWith') == 'ScriptArguments')
     if requires_script_arguments:
       raises_exceptions = True
       cpp_arguments = ['scriptArguments.release()']
       # WebKit uses scriptArguments to reconstruct last argument, so
       # it's not needed and should be just removed.
       arguments = arguments[:-1]
 
     requires_script_execution_context = (ext_attrs.get('CallWith') == 'ScriptExecutionContext' or
                                          ext_attrs.get('ConstructorCallWith') == 'ScriptExecutionContext')
-
-    requires_document = ext_attrs.get('ConstructorCallWith') == 'Document'
-
     if requires_script_execution_context:
       raises_exceptions = True
       cpp_arguments = ['context']
 
     requires_script_state = (ext_attrs.get('CallWith') == 'ScriptState' or
                              ext_attrs.get('ConstructorCallWith') == 'ScriptState')
     if requires_script_state:
       raises_exceptions = True
       cpp_arguments = ['&state']
 
     requires_dom_window = 'NamedConstructor' in ext_attrs
-    if requires_dom_window or requires_document:
+    if requires_dom_window:
       raises_exceptions = True
       cpp_arguments = ['document']
 
     if 'ImplementedBy' in ext_attrs:
       assert needs_receiver
       self._cpp_impl_includes.add('"%s.h"' % ext_attrs['ImplementedBy'])
       cpp_arguments.append('receiver')
 
     if 'Reflect' in ext_attrs:
       cpp_arguments = [self._GenerateWebCoreReflectionAttributeName(node)]
@@ skipping 64 matching lines @@
 
     if requires_script_state:
       body_emitter.Emit(
           '        ScriptState* currentState = ScriptState::current();\n'
           '        if (!currentState) {\n'
           '            exception = Dart_NewStringFromCString("Failed to retrieve a script state");\n'
           '            goto fail;\n'
           '        }\n'
           '        ScriptState& state = *currentState;\n\n')
 
-    if requires_dom_window or requires_document:
+    if requires_dom_window:
       self._cpp_impl_includes.add('"DOMWindow.h"')
       body_emitter.Emit(
           '        DOMWindow* domWindow = DartUtilities::domWindowForCurrentIsolate();\n'
           '        if (!domWindow) {\n'
           '            exception = Dart_NewStringFromCString("Failed to fetch domWindow");\n'
           '            goto fail;\n'
           '        }\n'
           '        Document* document = domWindow->document();\n')
 
     if needs_receiver:
@@ skipping 292 matching lines @@
             '    if (Dart_NativeFunction func = $CLASS_NAME::resolver(name, argumentCount))\n'
             '        return func;\n',
             CLASS_NAME=os.path.splitext(os.path.basename(path))[0])
 
 def _IsOptionalStringArgumentInInitEventMethod(interface, operation, argument):
   return (
       interface.id.endswith('Event') and
       operation.id.startswith('init') and
       argument.ext_attrs.get('Default') == 'Undefined' and
       argument.type.id == 'DOMString')