Revert "Revert "Dartium changes for custom element lifecycle events.""

Source/bindings/dart/gyp/scripts/massage_factories.py

 #!/usr/bin/python
 #
 # Copyright (C) 2011 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 49 matching lines @@
         (re.compile(r', bool'), ''),
         (re.compile(r', v8::Isolate\*( isolate)?'), ''),
         (re.compile(r', isolate'), ''),
         (re.compile(r', v8::Handle<v8::Object> creationContext'), ''),
         (re.compile(r', creationContext'), ''),
         (re.compile(r'v8::Handle<v8::Object>'), 'Dart_Handle'),
         (re.compile(r'V8'), 'Dart'),
     ])
     massage('cpp', [
         (re.compile(r'^#include "V8'), '#include "Dart'),
-        (re.compile(r'^#include "bindings/v8/CustomElementWrapper.h"'), '#include "bindings/dart/DartCustomElement.h"'),
+        (re.compile(r'^#include "bindings/v8/CustomElementWrapper.h"'), '#include "bindings/dart/DartCustomElementWrapper.h"'),
         (re.compile(r'v8\.h'), 'dart_api.h'),
         (re.compile(
             r'return wrap\(static_cast<(\w+)\*>\(element\), creationContext, isolate\);'),
             r'return Dart\1::createWrapper(static_cast<\1*>(element));'),
         (re.compile(
             r'return createWrapperFunction\(element, creationContext, isolate\)'),
             r'return createWrapperFunction(element)'),
         (re.compile(
             r'return V8%sElement::createWrapper\(element, creationContext, isolate\);' % tag),
             r'return DartDOMWrapper::createWrapper<Dart%sElement>(element);' % tag),
         (re.compile(
             r'return createV8HTMLFallbackWrapper\(toHTMLUnknownElement\(element\), creationContext, isolate\);'),
             r'return DartHTMLUnknownElement::createWrapper(toHTMLUnknownElement(element));'),
         (re.compile(
             r'return createV8HTMLDirectWrapper\(element, creationContext, isolate\);'),
             r'return DartDOMWrapper::createWrapper<DartHTMLElement>(element);'),
         (re.compile(
             r'= createV8HTMLDirectWrapper;'),
             r'= DartDOMWrapper::createWrapper<DartHTMLElement>;'),
         (re.compile(
             r'#include "bindings/v8/CustomElementHelpers.h"'),
             r'#include "bindings/v8/CustomElementHelpers.h"\n#include "bindings/dart/DartCustomElement.h"'),
         (re.compile(
             r'return CustomElementWrapper<%sElement, V8%sElement>::wrap\(element, creationContext, isolate, createWrapperFunction\);' % (tag, tag)),
-            r'return DartCustomElement::createWrapper(element, DartCustomElement::CreateWrapperFunction(createWrapperFunction));'),
+            r'return DartCustomElementWrapper<%sElement>::wrap(element, createWrapperFunction);' % tag),
         (re.compile(
             r'return wrap\(toHTMLUnknownElement\(element\), creationContext, isolate\);'),
-            # FIXME: We map custom elements to DartHTMLElement here instead of DartHTMLUnknownElement.
-            # This should be handled earlier.
-            r'return element->isCustomElement() ? DartDOMWrapper::createWrapper<DartHTMLElement>(element) : DartHTMLUnknownElement::createWrapper(toHTMLUnknownElement(element));'),
+            r'return DartHTMLUnknownElement::createWrapper(toHTMLUnknownElement(element));'),
         (re.compile(r'createV8%sWrapper' % tag), r'createDart%sWrapper' % tag),
         (re.compile(r', v8::Isolate\*( isolate)?'), ''),
         (re.compile(r', v8::Handle<v8::Object> creationContext'), ''),
         (re.compile(r'v8::Handle<v8::Object>'), 'Dart_Handle'),
         (re.compile(r'findSVGTagNameOfV8Type\(const WrapperTypeInfo\* type\)'), 'findSVGTagNameOfDartType(Dart_Handle type)'),
         (re.compile(r'findHTMLTagNameOfV8Type\(const WrapperTypeInfo\* type\)'), 'findHTMLTagNameOfDartType(Dart_Handle type)'),
         (re.compile(r'V8CustomElement'), 'DartCustomElement'),
         (re.compile(r'\s*map.set\(WrapperTypeTraits.*\n'), ''),
         (re.compile(r'HashMap<const WrapperTypeInfo\*, const QualifiedName\*>'), 'HashMap<Dart_Handle, const QualifiedName*>'),
     ])
 
     return 0
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv))