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

Source/bindings/dart/DartDOMWrapper.h

 // Copyright 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.
 //    * Redistributions in binary form must reproduce the above
@@ skipping 28 matching lines @@
 #include "core/dom/ExceptionCode.h"
 
 #include <dart_api.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 #include <wtf/text/AtomicString.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
+template<typename HTMLElement>
+class DartCustomElementWrapper;
+class HTMLElement;
+
 template<class BindingsClass>
 struct DartDOMWrapperTraits;
 
 class DartDOMWrapper {
 public:
     template <class WebKitClass>
     static Dart_Handle newWrapper(const char* className, const char* libraryName, intptr_t cid, WebKitClass* domObject)
     {
 
         Dart_Handle type = dartClass(className, libraryName, cid);
         ASSERT(!Dart_IsError(type));
         Dart_Handle wrapper = Dart_Allocate(type);
         writeNativePointer(wrapper, kNativeImplementationIndex, domObject);
         return wrapper;
     }
 
     static Dart_WeakPersistentHandle lookupWrapper(DartDOMData* domData, bool isNode, void* domObject)
     {
         ASSERT(domObject);
         ASSERT(domData);
         if (isNode) {
             Node* domNodeObject = reinterpret_cast<Node*>(domObject);
-            Dart_WeakPersistentHandle wrapper = domData->nodeMap()->get(domNodeObject);
-            if (wrapper && domNodeObject->isCustomElement()) {
-                return lookupCustomElementWrapper(domData, wrapper, domNodeObject);
-            }
-            return wrapper;
+            return domData->nodeMap()->get(domNodeObject);
         }
         return domData->objectMap()->get(domObject);
     }
 
     template <class BindingsClass>
     static Dart_Handle createWrapper(typename BindingsClass::NativeType* domObject)
     {
         ASSERT(domObject);
         return createWrapperWithClassName<BindingsClass>(
             domObject,
@@ skipping 109 matching lines @@
     static void returnToDart(Dart_NativeArguments args, PassRefPtr<typename BindingsClass::NativeType> domObject)
     {
         returnToDart<BindingsClass>(args, domObject.get());
     }
 
     static int wrapperNativeFieldCount() { return kNativeFieldCount; }
 
     static Dart_Handle exceptionCodeToDartException(ExceptionCode);
     static Dart_Handle exceptionCodeToDartException(DartExceptionState&);
 
+    template <class BindingsClass>
+    static Dart_Handle dartClass()
+    {
+        return dartClass(BindingsClass::dartImplementationClassName,
+            BindingsClass::dartImplementationLibraryName, BindingsClass::dartClassId);
+    }
+
 private:
     enum NativeFieldIndices {
         kNativeImplementationIndex = 0,
         kNativeFieldCount
     };
 
     static Dart_Handle dartClass(const char* dartImplementationClassName,
         const char* dartImplementationLibraryName, intptr_t classIndex);
 
-    template <class BindingsClass>
-    static Dart_Handle dartClass()
-    {
-        return dartClass(BindingsClass::dartImplementationClassName,
-            BindingsClass::dartImplementationLibraryName, BindingsClass::dartClassId);
-    }
-
     static void writeNativePointer(Dart_Handle wrapper, int index, void* pointer)
     {
         DartApiScope scope;
         Dart_Handle result = Dart_SetNativeInstanceField(wrapper, index, reinterpret_cast<intptr_t>(pointer));
         UNUSED_PARAM(result);
         ASSERT(!Dart_IsError(result));
     }
 
     static void* readNativePointer(Dart_Handle wrapper, int index)
     {
@@ skipping 15 matching lines @@
         DartDOMData* domData = DartDOMData::current();
         typename BindingsClass::NativeType* domObject = static_cast<typename BindingsClass::NativeType*>(peer);
         if (DartDOMWrapperTraits<BindingsClass>::MapTraits::domMap(domData)->contains(domObject)) {
             Traits::MapTraits::domMap(domData)->remove(domObject);
             Traits::ActiveTraits::removeWrapper(domData, domObject);
             Traits::EventTargetTraits::removeWrapper(domData, domObject);
         }
         domObject->deref();
     }
 
-    static Dart_WeakPersistentHandle lookupCustomElementWrapper(
-        DartDOMData*, Dart_WeakPersistentHandle wrapper, Node* domObject);
-
     template <class BindingsClass>
     static void associateWrapper(typename BindingsClass::NativeType* domObject, Dart_Handle newInstance)
     {
         typedef DartDOMWrapperTraits<BindingsClass> Traits;
 
         DartDOMData* domData = DartDOMData::current();
         Dart_WeakPersistentHandle wrapper = DartUtilities::createPrologueWeakPersistentHandle(
             newInstance, domObject, &wrapperWeakCallback<BindingsClass>);
         Traits::MapTraits::domMap(domData)->set(domObject, wrapper);
         Traits::ActiveTraits::setWrapper(domData, domObject, wrapper);
         Traits::EventTargetTraits::setWrapper(domData, domObject, wrapper);
         domObject->ref();
     }
 
     template <class BindingsClass>
     static void disassociateWrapper(typename BindingsClass::NativeType* domObject, Dart_Handle oldInstance)
     {
         typedef DartDOMWrapperTraits<BindingsClass> Traits;
 
         DartDOMData* domData = DartDOMData::current();
         Dart_WeakPersistentHandle wrapper = Traits::MapTraits::domMap(domData)->get(domObject);
         ASSERT(Dart_IdentityEquals(Dart_HandleFromWeakPersistent(wrapper), oldInstance));
         Traits::MapTraits::domMap(domData)->remove(domObject);
         Traits::ActiveTraits::removeWrapper(domData, domObject);
         Traits::EventTargetTraits::removeWrapper(domData, domObject);
     }
 
-    friend class DartCustomElement;
+    friend class DartCustomElementWrapper<HTMLElement>;
 };
 
 template<bool isNode>
 struct DartDOMWrapperMapTraits { };
 
 template<>
 struct DartDOMWrapperMapTraits<false> {
     static DartDOMObjectMap* domMap(DartDOMData* domData) { return domData->objectMap(); }
 };
 
@@ skipping 63 matching lines @@
         static DartMessagePortMap* domMap(DartDOMData* domData) { return domData->messagePortMap(); }
     };
     typedef MessagePortMapTraits MapTraits;
     typedef DartDOMWrapperActiveTraits<DartMessagePort, false> ActiveTraits;
     typedef DartDOMWrapperEventTargetTraits<DartMessagePort, true> EventTargetTraits;
 };
 
 }
 
 #endif // DartDOMWrapper_h