Revert "Chrome 38 script changes from integration branch"

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 1321 matching lines @@
 
     if self._IsStatic(node.id):
       needs_receiver = True
 
     cpp_arguments = []
     runtime_check = None
     raises_exceptions = raises_dom_exception or arguments or needs_receiver
     needs_custom_element_callbacks = False
 
     # TODO(antonm): unify with ScriptState below.
-    call_with = ext_attrs.get('CallWith', '') + ext_attrs.get('ConstructorCallWith', '')
-    requires_stack_info = 'ScriptArguments' in call_with or 'ScriptState' in call_with
+    requires_stack_info = (ext_attrs.get('CallWith') == 'ScriptArguments|ScriptState' or
+                           ext_attrs.get('ConstructorCallWith') == 'ScriptArguments|ScriptState' or
+                           ext_attrs.get('CallWith') == 'ScriptArguments&ScriptState' or
+                           ext_attrs.get('ConstructorCallWith') == 'ScriptArguments&ScriptState')
     if requires_stack_info:
       raises_exceptions = True
       cpp_arguments = ['&state', 'scriptArguments.release()']
       # WebKit uses scriptArguments to reconstruct last argument, so
       # it's not needed and should be just removed.
       arguments = arguments[:-1]
 
     # TODO(antonm): unify with ScriptState below.
     requires_script_arguments = (ext_attrs.get('CallWith') == 'ScriptArguments' or
                                  ext_attrs.get('ConstructorCallWith') == 'ScriptArguments')
@@ skipping 645 matching lines @@
 
 def _IsCustom(op_or_attr):
   assert(isinstance(op_or_attr, IDLMember))
   return 'Custom' in op_or_attr.ext_attrs or 'DartCustom' in op_or_attr.ext_attrs
 
 def _IsCustomValue(op_or_attr, value):
   if _IsCustom(op_or_attr):
     return op_or_attr.ext_attrs.get('Custom') == value \
            or op_or_attr.ext_attrs.get('DartCustom') == value
   return False