Fixing custom element type extensions to have correct native type

Source/bindings/dart/DartCustomElementConstructorBuilder.cpp

 /*
  * Copyright (C) 2013 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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "bindings/dart/DartCustomElementConstructorBuilder.h"
 
+#include "DartHTMLElement.h"
 #include "HTMLNames.h"
 #include "SVGNames.h"
 #include "bindings/dart/DartCustomElementBinding.h"
 #include "bindings/dart/DartCustomElementLifecycleCallbacks.h"
 #include "bindings/dart/DartDOMData.h"
+#include "bindings/dart/DartDOMWrapper.h"
 #include "bindings/dart/DartUtilities.h"
 #include "bindings/v8/V8Binding.h"
 #include "core/dom/CustomElementException.h"
 #include "core/dom/Document.h"
 
 namespace WebCore {
 
 DartCustomElementConstructorBuilder::DartCustomElementConstructorBuilder(Dart_Handle customType, const AtomicString& extendsTagName, ScriptState* state, const Dictionary* options)
     : CustomElementConstructorBuilder(state, options)
     , m_customType(customType)
+    , m_nativeClassId(-1)

[vsm, 2013/10/18 21:18:15]

We should make an enum for InvalidClassId just to make sure we don't conflict.

[blois, 2013/10/18 23:03:40]

Done.

     , m_extendsTagName(extendsTagName)
     , m_isolate(Dart_CurrentIsolate())
     , m_context(state->context())
 {
     ASSERT(m_context == v8::Isolate::GetCurrent()->GetCurrentContext());
 }
 
 bool DartCustomElementConstructorBuilder::isFeatureAllowed() const
 {
     // Check that we are in the main world
@@ skipping 13 matching lines @@
         return false;
     } else {
         CustomElementException::throwException(CustomElementException::PrototypeDoesNotExtendHTMLElementSVGElementPrototype, type, es);
         return false;
     }
 
     AtomicString localName;
     if (!m_extendsTagName.isNull() && !m_extendsTagName.isEmpty()) {
         localName = m_extendsTagName.lower();
 
-        if (!DartUtilities::isTypeSubclassOfTag(m_customType, m_extendsTagName)) {
+        Dart_Handle nativeElement = DartUtilities::getAndValidateNativeType(m_customType, m_extendsTagName);
+        if (!nativeElement) {
+            CustomElementException::throwException(CustomElementException::PrototypeDoesNotExtendHTMLElementSVGElementPrototype, type, es);
+            return false;
+        }
+        if (Dart_IsNull(nativeElement)) {

[vsm, 2013/10/18 21:18:15]

Why not combine these two if clauses?  The bodies look the same.

[blois, 2013/10/18 23:03:40]

Done.

             CustomElementException::throwException(CustomElementException::PrototypeDoesNotExtendHTMLElementSVGElementPrototype, type, es);
             return false;
         }
 
+        m_nativeClassId = reinterpret_cast<intptr_t>(DartDOMWrapper::readNativePointer(nativeElement, DartDOMWrapper::kNativeTypeIndex));
+
         // TODO: enable once we pick up Blink version 31
         // if (!Document::isValidName(localName)) {
         //     CustomElementException::throwException(CustomElementException::ExtendsIsInvalidName, type, es);
         //     return false;
         // }
         // if (CustomElement::isValidName(localName)) {
         //     CustomElementException::throwException(CustomElementException::ExtendsIsCustomElementName, type, es);
         //     return false;
         // }
     } else {
         localName = type;
+        m_nativeClassId = DartHTMLElement::dartClassId;
     }
 
     m_localName = localName;
     m_namespaceURI = namespaceURI;
     return true;
 }
 
 bool DartCustomElementConstructorBuilder::findTagName(const AtomicString& customElementType, QualifiedName& tagName)
 {
     if (!m_extendsTagName.isNull() && !m_extendsTagName.isEmpty()) {
@@ skipping 12 matching lines @@
     return m_callbacks.get();
 }
 
 bool DartCustomElementConstructorBuilder::createConstructor(Document* document, CustomElementDefinition* definition, ExceptionState& es)
 {
     return true;
 }
 
 bool DartCustomElementConstructorBuilder::didRegisterDefinition(CustomElementDefinition* definition) const
 {
-    return m_callbacks->setBinding(definition, DartCustomElementBinding::create(m_customType));
+    return m_callbacks->setBinding(definition, DartCustomElementBinding::create(m_customType, m_nativeClassId));
 }
 
 ScriptValue DartCustomElementConstructorBuilder::bindingsReturnValue() const
 {
     // Dart does not return a constructor.
     return ScriptValue();
 }
 } // namespace WebCore