Fixes for Blink roll.

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
 from generator import *
 from htmldartgenerator import *
 from idlnode import IDLArgument, IDLAttribute
 from systemhtml import js_support_checks, GetCallbackInfo, HTML_LIBRARY_NAMES
 
 _cpp_type_map = {
   ('DataTransferItem', 'webkitGetAsEntry'): 'DataTransferItemFileSystem',
-  ('DOMWindow', 'indexedDB'): 'DOMWindowIndexedDatabase',
-  ('DOMWindow', 'speechSynthesis'): 'DOMWindowSpeechSynthesis',
-  ('DOMWindow', 'webkitNotifications'): 'DOMWindowNotifications',
-  ('DOMWindow', 'storage'): 'DOMWindowQuota',
-  ('DOMWindow', 'webkitStorageInfo'): 'DOMWindowQuota',
-  ('DOMWindow', 'openDatabase'): 'DOMWindowWebDatabase',
-  ('DOMWindow', 'webkitRequestFileSystem'): 'DOMWindowFileSystem',
-  ('DOMWindow', 'webkitResolveLocalFileSystemURL'): 'DOMWindowFileSystem',
+  ('Document', 'webkitIsFullScreen'): 'DocumentFullscreen',
+  ('Document', 'webkitFullScreenKeyboardInputAllowed'): 'DocumentFullscreen',
+  ('Document', 'webkitCurrentFullScreenElement'): 'DocumentFullscreen',
+  ('Document', 'webkitCancelFullScreen'): 'DocumentFullscreen',
+  ('Document', 'webkitFullscreenEnabled'): 'DocumentFullscreen',
+  ('Document', 'webkitFullscreenElement'): 'DocumentFullscreen',
+  ('Document', 'webkitExitFullscreen'): 'DocumentFullscreen',
+  ('Window', 'crypto'): 'DOMWindowCrypto',
+  ('Window', 'indexedDB'): 'DOMWindowIndexedDatabase',
+  ('Window', 'speechSynthesis'): 'DOMWindowSpeechSynthesis',
+  ('Window', 'webkitNotifications'): 'DOMWindowNotifications',
+  ('Window', 'storage'): 'DOMWindowQuota',
+  ('Window', 'webkitStorageInfo'): 'DOMWindowQuota',
+  ('Window', 'openDatabase'): 'DOMWindowWebDatabase',
+  ('Window', 'webkitRequestFileSystem'): 'DOMWindowFileSystem',
+  ('Window', 'webkitResolveLocalFileSystemURL'): 'DOMWindowFileSystem',
   ('HTMLInputElement', 'webkitEntries'): 'HTMLInputElementFileSystem',
   ('Navigator', 'doNotTrack'): 'NavigatorDoNotTrack',
   ('Navigator', 'geolocation'): 'NavigatorGeolocation',
   ('Navigator', 'webkitPersistentStorage'): 'NavigatorStorageQuota',
   ('Navigator', 'webkitTemporaryStorage'): 'NavigatorStorageQuota',
   ('Navigator', 'registerProtocolHandler'): 'NavigatorContentUtils',
   ('Navigator', 'unregisterProtocolHandler'): 'NavigatorContentUtils',
   ('Navigator', 'webkitGetUserMedia'): 'NavigatorMediaStream',
   ('Navigator', 'webkitGetGamepads'): 'NavigatorGamepad',
+  ('Navigator', 'requestMIDIAccess'): 'NavigatorWebMIDI',
+  ('Navigator', 'vibrate'): 'NavigatorVibration',
   }
 
 _cpp_partial_map = {}
 
 def _GetCPPPartialNames(interface_name):
   if not _cpp_partial_map:
     for (type, member) in _cpp_type_map.keys():
       if type not in _cpp_partial_map:
         _cpp_partial_map[type] = set([])
       _cpp_partial_map[type].add(_cpp_type_map[(type, member)])
@@ skipping 241 matching lines @@
 
   def FinishInterface(self):
     self._GenerateCPPHeader()
 
     self._cpp_impl_emitter.Emit(
         self._template_loader.Load('cpp_implementation.template'),
         INTERFACE=self._interface.id,
         INCLUDES=self._GenerateCPPIncludes(self._cpp_impl_includes),
         CALLBACKS=self._cpp_definitions_emitter.Fragments(),
         RESOLVER=self._cpp_resolver_emitter.Fragments(),
+        WEBCORE_CLASS_NAME=self._interface_type_info.native_type(),
+        WEBCORE_CLASS_NAME_ESCAPED=
+        self._interface_type_info.native_type().replace('<', '_').replace('>', '_'),
         DART_IMPLEMENTATION_CLASS=self._interface_type_info.implementation_name(),
         DART_IMPLEMENTATION_LIBRARY='dart:%s' % self._renamer.GetLibraryName(self._interface))
 
   def _GenerateCPPHeader(self):
     to_native_emitter = emitter.Emitter()
     if self._interface_type_info.custom_to_native():
       return_type = 'PassRefPtr<NativeType>'
       to_native_body = ';'
     else:
       return_type = 'NativeType*'
@@ skipping 40 matching lines @@
     is_active_test = lambda interface: 'ActiveDOMObject' in interface.ext_attrs
     is_event_target_test = lambda interface: 'EventTarget' in interface.ext_attrs
     def TypeCheckHelper(test):
       return 'true' if any(map(test, self._database.Hierarchy(self._interface))) else 'false'
 
     self._cpp_header_emitter.Emit(
         self._template_loader.Load('cpp_header.template'),
         INTERFACE=self._interface.id,
         WEBCORE_INCLUDES=webcore_includes,
         WEBCORE_CLASS_NAME=self._interface_type_info.native_type(),
+        WEBCORE_CLASS_NAME_ESCAPED=
+        self._interface_type_info.native_type().replace('<', '_').replace('>', '_'),
         DECLARATIONS=self._cpp_declarations_emitter.Fragments(),
         IS_NODE=TypeCheckHelper(is_node_test),
         IS_ACTIVE=TypeCheckHelper(is_active_test),
         IS_EVENT_TARGET=TypeCheckHelper(is_event_target_test),
         TO_NATIVE=to_native_emitter.Fragments(),
         TO_DART=to_dart_emitter.Fragments())
 
   def EmitAttribute(self, attribute, html_name, read_only):
     self._AddGetter(attribute, html_name)
     if not read_only:
@@ skipping 234 matching lines @@
       return_type,
       return_type_is_nullable,
       raises_dom_exception):
     ext_attrs = node.ext_attrs
 
     cpp_arguments = []
     runtime_check = None
     raises_exceptions = raises_dom_exception or arguments
 
     # TODO(antonm): unify with ScriptState below.
-    requires_stack_info = ext_attrs.get('CallWith') == 'ScriptArguments|ScriptState'
+    requires_stack_info = (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'
+    requires_script_arguments = (ext_attrs.get('CallWith') == 'ScriptArguments' or
+                                 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'
+    requires_script_execution_context = (ext_attrs.get('CallWith') == 'ScriptExecutionContext' or
+                                         ext_attrs.get('ConstructorCallWith') == 'ScriptExecutionContext')
     if requires_script_execution_context:
       raises_exceptions = True
       cpp_arguments = ['context']
 
-    requires_script_state = ext_attrs.get('CallWith') == 'ScriptState'
+    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:
       raises_exceptions = True
       cpp_arguments = ['document']
 
     if 'ImplementedBy' in ext_attrs:
@@ skipping 195 matching lines @@
         '        if (UNLIKELY(ec)) {\n'
         '            exception = DartDOMWrapper::exceptionCodeToDartException(ec);\n'
         '            goto fail;\n'
         '        }\n')
 
 
     if needs_receiver:
       interface_name = self._interface_type_info.native_type()
       cpp_type_name = _GetCPPTypeName(interface_name,
                                       node.id)
-      if interface_name != cpp_type_name:
+      # Hack to determine if this came from the _cpp_type_map.
+      # In this case, the getter is mapped to a static method.
+      if (not function_expression.startswith('receiver->') and
+          not function_expression.startswith(interface_name + '::')):
+        if 'childNodes' in callback_name:
+          print function_expression
+          print interface_name
+          raise 'hell'
         if interface_name == 'DOMWindow' or interface_name == 'Navigator':
           cpp_arguments.insert(0, 'receiver')
         else:
           cpp_arguments.append('receiver')
 
     function_call = '%s(%s)' % (function_expression, ', '.join(cpp_arguments))
     if return_type == 'void':
       invocation_emitter.Emit(
         '        $FUNCTION_CALL;\n',
         FUNCTION_CALL=function_call)
@@ skipping 154 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')