Setting native pointer of custom elements before running constructor.

Source/bindings/dart/DartCustomElementWrapper.cpp

 /*
  * Copyright (C) 2012 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 94 matching lines @@
 
     Dart_WeakPersistentHandle oldInstance = DartDOMWrapper::lookupWrapper(
         domData, DartHTMLElement::isNode, reinterpret_cast<HTMLElement*>(element));
     if (oldInstance) {
         DartDOMWrapper::disassociateWrapper<DartHTMLElement>(
             domData,
             reinterpret_cast<HTMLElement*>(element),
             Dart_HandleFromWeakPersistent(oldInstance));
     }
 
-    domData->pushUpgradingCustomElement(element);
+    Dart_Handle newInstance = Dart_Allocate(customType);
+    ASSERT(!Dart_IsError(newInstance));
 
-    Dart_Handle newInstance = Dart_New(customType, Dart_NewStringFromCString("created"), 0, 0);
-    if (Dart_IsError(newInstance)) {
-        domData->popUpgradingCustomElement();
+    Dart_Handle result = Dart_SetNativeInstanceField(newInstance, 0, reinterpret_cast<intptr_t>(element));
+    UNUSED_PARAM(result);
+    ASSERT(!Dart_IsError(result));
 
-        DartUtilities::reportProblem(DartDOMData::current()->scriptExecutionContext(), newInstance);
+    result = Dart_InvokeConstructor(newInstance, Dart_NewStringFromCString("created"), 0, 0);
+
+    if (Dart_IsError(result)) {
+        DartUtilities::reportProblem(domData->scriptExecutionContext(), newInstance);
 
         // Fall back to the old wrapper if possible.
         if (oldInstance) {
             Dart_Handle oldWrapper = Dart_HandleFromWeakPersistent(oldInstance);
             DartDOMWrapper::associateWrapper<DartHTMLElement>(domData, element, oldWrapper);
             return oldWrapper;
         }
 
         // When the upgrade fails the failed wrapper may have been associated,
         // so we need to create a new one and re-associate it.
         Dart_Handle fallbackWrapper = createUpgradeCandidateWrapper(element, createSpecificWrapper);
 
         DartDOMWrapper::associateWrapper<DartHTMLElement>(domData, element, fallbackWrapper);
         Dart_Handle result = Dart_SetNativeInstanceField(fallbackWrapper, 0, reinterpret_cast<intptr_t>(element));
         UNUSED_PARAM(result);
         ASSERT(!Dart_IsError(result));
 
         return fallbackWrapper;
     }
-    // Should have come through initializeCustomElement.
-    ASSERT(!domData->isUpgradingCustomElement(element));
     return newInstance;
 }
 
 template<>
 Dart_Handle DartCustomElementWrapper<SVGElement>::upgradeDartWrapper(SVGElement* element, Dart_Handle (*createSpecificWrapper)(SVGElement* element))
 {
     // TODO: support SVG elements.
     ASSERT(FALSE);
     return Dart_Handle();
 }
 
 template<>
 void DartCustomElementWrapper<HTMLElement>::initializeCustomElement(Dart_Handle wrapper, Dart_Handle& exception)
 {
     DartDOMData* domData = DartDOMData::current();
-    HTMLElement* element = reinterpret_cast<HTMLElement*>(domData->popUpgradingCustomElement());
+    HTMLElement* element = DartDOMWrapper::unwrapDartWrapper<DartHTMLElement>(domData, wrapper, exception);
+    if (exception) {
+        return;
+    }
     if (!element) {
         exception = Dart_NewStringFromCString("created called outside of custom element creation.");
         return;
     }
 
     DartDOMWrapper::associateWrapper<DartHTMLElement>(domData, element, wrapper);
-
-    Dart_Handle result = Dart_SetNativeInstanceField(wrapper, 0, reinterpret_cast<intptr_t>(element));
-    UNUSED_PARAM(result);
-    ASSERT(!Dart_IsError(result));
 }
 
 template
 class DartCustomElementWrapper<HTMLElement>;
 
 template
 class DartCustomElementWrapper<SVGElement>;
 
 } // namespace WebCore