Minor refactoring to streamline the logic.

lib/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 642 matching lines @@
 
   def _GenerateNativeCallback(self,
       callback_name,
       needs_receiver,
       function_expression,
       node,
       arguments,
       return_type,
       raises_dom_exception):
     ext_attrs = node.ext_attrs
+
     cpp_arguments = []
+    requires_v8_scope = \
+        any((self._TypeInfo(argument.type.id).requires_v8_scope() for argument in arguments))
+    runtime_check = None
+    raises_exceptions = raises_dom_exception or arguments
 
-    requires_v8_scope = False
-    runtime_check = None
-    raises_exceptions = False
-    requires_script_execution_context = False
-    requires_dom_window = False
-    requires_stack_info = False
-
-    if raises_dom_exception or arguments:
-      raises_exceptions = True
-
-    if ext_attrs.get('CallWith') == 'ScriptArguments|CallStack':
+    requires_stack_info = ext_attrs.get('CallWith') == 'ScriptArguments|CallStack'
+    if requires_stack_info:
       raises_exceptions = True
       requires_v8_scope = True
-      requires_stack_info = True
-      self._cpp_impl_includes.add('"ScriptArguments.h"')
-      self._cpp_impl_includes.add('"ScriptCallStack.h"')
       cpp_arguments = ['scriptArguments', 'scriptCallStack']
       # WebKit uses scriptArguments to reconstruct last argument, so
       # it's not needed and should be just removed.
       arguments = arguments[:-1]
 
-    if ext_attrs.get('CallWith') == 'ScriptExecutionContext':
+    requires_script_execution_context = ext_attrs.get('CallWith') == 'ScriptExecutionContext'
+    if requires_script_execution_context:
       raises_exceptions = True
-      requires_script_execution_context = True
       cpp_arguments = ['context']
 
+    requires_dom_window = 'NamedConstructor' in ext_attrs
+    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 'NamedConstructor' in ext_attrs:
-      raises_exceptions = True
-      requires_dom_window = True
-      self._cpp_impl_includes.add('"DOMWindow.h"')
-      cpp_arguments = ['document']
-
     if 'Reflect' in ext_attrs:
       cpp_arguments = [self._GenerateWebCoreReflectionAttributeName(node)]
 
-    for argument in arguments:
-      if self._TypeInfo(argument.type.id).requires_v8_scope():
-        requires_v8_scope = True
-
     assert (not (
       'synthesizedV8EnabledPerContext' in ext_attrs and
       'synthesizedV8EnabledAtRuntime' in ext_attrs))
     if 'synthesizedV8EnabledPerContext' in ext_attrs:
       raises_exceptions = True
       self._cpp_impl_includes.add('"ContextFeatures.h"')
       self._cpp_impl_includes.add('"DOMWindow.h"')
       runtime_check = emitter.Format(
           '        if (!ContextFeatures::$(FEATURE)Enabled(DartUtilities::domWindowForCurrentIsolate()->document())) {\n'
           '            exception = Dart_NewString("Feature $FEATURE is not enabled");\n'
@@ skipping 46 matching lines @@
 
     if requires_script_execution_context:
       body_emitter.Emit(
           '        ScriptExecutionContext* context = DartUtilities::scriptExecutionContext();\n'
           '        if (!context) {\n'
           '            exception = Dart_NewString("Failed to retrieve a context");\n'
           '            goto fail;\n'
           '        }\n\n')
 
     if requires_dom_window:
+      self._cpp_impl_includes.add('"DOMWindow.h"')
       body_emitter.Emit(
           '        DOMWindow* domWindow = DartUtilities::domWindowForCurrentIsolate();\n'
           '        if (!domWindow) {\n'
           '            exception = Dart_NewString("Failed to fetch domWindow");\n'
           '            goto fail;\n'
           '        }\n'
           '        Document* document = domWindow->document();\n')
 
     if needs_receiver:
       body_emitter.Emit(
           '        $WEBCORE_CLASS_NAME* receiver = DartDOMWrapper::receiver< $WEBCORE_CLASS_NAME >(args);\n',
           WEBCORE_CLASS_NAME=self._interface_type_info.native_type())
 
     if requires_stack_info:
+      self._cpp_impl_includes.add('"ScriptArguments.h"')
+      self._cpp_impl_includes.add('"ScriptCallStack.h"')
       body_emitter.Emit(
           '\n'
           '        Dart_Handle customArgument = Dart_GetNativeArgument(args, $INDEX);\n'
           '        RefPtr<ScriptArguments> scriptArguments(DartUtilities::createScriptArguments(customArgument, exception));\n'
           '        if (!scriptArguments)\n'
           '            goto fail;\n'
           '        RefPtr<ScriptCallStack> scriptCallStack(DartUtilities::createScriptCallStack());\n'
           '        if (!scriptCallStack->size())\n'
           '            return;\n',
           INDEX=len(arguments) + 1)
@@ skipping 121 matching lines @@
     parent_interface = _FindInHierarchy(database, parent_interface, test)
     if parent_interface:
       return parent_interface
 
 def _ToWebKitName(name):
   name = name[0].lower() + name[1:]
   name = re.sub(r'^(hTML|uRL|jS|xML|xSLT)', lambda s: s.group(1).lower(),
                 name)
   return re.sub(r'^(create|exclusive)', lambda s: 'is' + s.group(1).capitalize(),
                 name)