Unfork html events generation in dart2js and dartium.

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 182 matching lines @@
   def ImplementationClassName(self):
     return self._ImplClassName(self._interface.id)
 
   def FilePathForDartImplementation(self):
     return os.path.join(self._system._output_dir, 'dart',
                         '%sImplementation.dart' % self._interface.id)
 
   def SetImplementationEmitter(self, implementation_emitter):
     self._dart_impl_emitter = implementation_emitter
 
+  def AddMergedMembers(self, merged_interface):

[Anton Muhin, 2012/07/02 10:49:48]

why it doesn't need any implementation?

[podivilov, 2012/07/02 17:08:18]

Underlying c++ object doesn't implement merged methods.  Added comment
explaining this

+    pass
+
   def StartInterface(self):
     # Create emitters for c++ implementation.
     if self.HasImplementation():
       cpp_header_path = self._system._FilePathForCppHeader(self._interface.id)
       self._system._cpp_header_files.append(cpp_header_path)
       self._cpp_header_emitter = self._system._emitters.FileEmitter(cpp_header_path)
       cpp_impl_path = self._system._FilePathForCppImplementation(self._interface.id)
       self._system._cpp_impl_files.append(cpp_impl_path)
       self._cpp_impl_emitter = self._system._emitters.FileEmitter(cpp_impl_path)
     else:
       self._cpp_header_emitter = emitter.Emitter()
       self._cpp_impl_emitter = emitter.Emitter()
 
     self._interface_type_info = GetIDLTypeInfo(self._interface.id)
     self._members_emitter = emitter.Emitter()
     self._cpp_declarations_emitter = emitter.Emitter()
     self._cpp_impl_includes = set()
     self._cpp_definitions_emitter = emitter.Emitter()
     self._cpp_resolver_emitter = emitter.Emitter()
 
     self._GenerateConstructors()
-    self._GenerateEvents()
+    return self._members_emitter
 
   def _GenerateConstructors(self):
     html_interface_name = self._HTMLInterfaceName(self._interface.id)
 
     if not self._IsConstructable():
       return
 
     # TODO(antonm): currently we don't have information about number of arguments expected by
     # the constructor, so name only dispatch.
     self._cpp_resolver_emitter.Emit(
@@ skipping 80 matching lines @@
           '            goto fail;\n'
           '        }',
           FEATURE=_ToWebKitName(ext_attrs['synthesizedV8EnabledAtRuntime']))
 
     self._GenerateNativeCallback(callback_name='constructorCallback',
         parameter_definitions=parameter_definitions_emitter.Fragments(),
         needs_receiver=False, invocation=invocation,
         raises_exceptions=raises_exceptions,
         runtime_check=runtime_check)
 
-  def _GenerateEvents(self):
-    if self._interface.id == 'DocumentFragment':
-      # Interface DocumentFragment extends Element in dart:html but this fact
-      # is not reflected in idls.
-      self._EmitEventGetter('_ElementEventsImpl')
-      return
-
-    events_attributes = [attr for attr in self._interface.attributes
-                         if attr.type.id == 'EventListener']
-    if not 'EventTarget' in self._interface.ext_attrs and not events_attributes:
-      return
-
-    def IsEventTarget(interface):
-      return ('EventTarget' in interface.ext_attrs and
-              interface.id != 'EventTarget')
-    is_root = not _FindParent(self._interface, self._database, IsEventTarget)
-    if is_root:
-      self._members_emitter.Emit('  _EventsImpl _on;\n')
-
-    if not events_attributes:
-      if is_root:
-        self._EmitEventGetter('_EventsImpl')
-      return
-
-    events_class = '_%sEventsImpl' % self._interface.id
-    self._EmitEventGetter(events_class)
-
-    def HasEventAttributes(interface):
-      return any([a.type.id == 'EventListener' for a in interface.attributes])
-    parent = _FindParent(self._interface, self._database, HasEventAttributes)
-    if parent:
-      parent_events_class = '_%sEventsImpl' % parent.id
-    else:
-      parent_events_class = '_EventsImpl'
-
-    html_inteface = self._HTMLInterfaceName(self._interface.id)
-    events_members = self._dart_impl_emitter.Emit(
-        '\n'
-        'class $EVENTS_CLASS extends $PARENT_EVENTS_CLASS implements $EVENTS_INTERFACE {\n'
-        '  $EVENTS_CLASS(_ptr) : super(_ptr);\n'
-        '$!MEMBERS\n'
-        '}\n',
-        EVENTS_CLASS=events_class,
-        PARENT_EVENTS_CLASS=parent_events_class,
-        EVENTS_INTERFACE='%sEvents' % html_inteface)
-
-    events_attributes = DomToHtmlEvents(self._interface.id, events_attributes)
-    for event_name in events_attributes:
-      events_members.Emit(
-          '  EventListenerList get $HTML_NAME() => this[\'$DOM_NAME\'];\n',
-          HTML_NAME=DomToHtmlEvent(event_name),
-          DOM_NAME=event_name)
-
-  def _EmitEventGetter(self, events_class):
-    self._members_emitter.Emit(
-        '\n'
-        '  $EVENTS_CLASS get on() {\n'
-        '    if (_on === null) _on = new $EVENTS_CLASS(this);\n'
-        '    return _on;\n'
-        '  }\n',
-        EVENTS_CLASS=events_class)
-
   def _ImplClassName(self, interface_name):
     return '_%sImpl' % interface_name
 
   def _DartType(self, idl_type):
     return self._html_system.DartType(idl_type)
 
   def _BaseClassName(self):
     root_class = 'NativeFieldWrapperClass1'
 
     if not self._interface.parents:
       return root_class
 
     supertype = self._interface.parents[0].type.id
 
     if IsPureInterface(supertype):    # The class is a root.
       return root_class
 
     # FIXME: We're currently injecting List<..> and EventTarget as
     # supertypes in dart.idl. We should annotate/preserve as
     # attributes instead.  For now, this hack lets the self._interfaces
     # inherit, but not the classes.
     # List methods are injected in AddIndexer.
     if IsDartListType(supertype) or IsDartCollectionType(supertype):
       return root_class
 
-    if supertype == 'EventTarget':
-      # Most implementors of EventTarget specify the EventListener operations
-      # again.  If the operations are not specified, try to inherit from the
-      # EventTarget implementation.
-      #
-      # Applies to MessagePort.
-      if not [op for op in self._interface.operations if op.id == 'addEventListener']:
-        return self._ImplClassName(supertype)
-      return root_class
-
     return self._ImplClassName(supertype)
 
   def _HTMLInterfaceName(self, interface_name):
     return self._html_renames.get(interface_name, interface_name)
 
   def _IsConstructable(self):
     # FIXME: support ConstructorTemplate.
     return set(['CustomConstructor', 'V8CustomConstructor', 'Constructor', 'NamedConstructor']) & set(self._interface.ext_attrs)
 
   def _EmitFactoryProvider(self, interface_name, constructor_info):
@@ skipping 637 matching lines @@
 
 def _IsArgumentOptionalInWebCore(argument):
   return IsOptional(argument) and not 'Callback' in argument.ext_attrs
 
 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)