Create wrappers for unresolved Custom Elements at the correct type

Source/bindings/v8/CustomElementHelpers.h

 /*
  * 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 25 matching lines @@
 #include "core/dom/CustomElementDefinition.h"
 #include "core/dom/CustomElementRegistry.h"
 #include "core/dom/Element.h"
 #include <wtf/Forward.h>
 #include <wtf/PassRefPtr.h>
 
 namespace WebCore {
 
 class CustomElementConstructor;
 class CustomElementInvocation;
+class HTMLElement;
 class QualifiedName;
 class ScriptState;
+class SVGElement;

[haraken, 2013/05/01 18:49:12]

Nit: Alphabetical order please.

 
 class CustomElementHelpers {
 public:
     static bool initializeConstructorWrapper(CustomElementConstructor*, const ScriptValue& prototype, ScriptState*);
     static bool isValidPrototypeParameter(const ScriptValue&, ScriptState*, AtomicString& namespaceURI);
     static bool isValidPrototypeParameter(const ScriptValue&, ScriptState*);
     static bool isFeatureAllowed(ScriptState*);
     static const QualifiedName* findLocalName(const ScriptValue& prototype);
 
     static bool isFeatureAllowed(v8::Handle<v8::Context>);
     static WrapperTypeInfo* findWrapperType(v8::Handle<v8::Value> chain);
     static const QualifiedName* findLocalName(v8::Handle<v8::Object> chain);
 
     static void invokeReadyCallbacksIfNeeded(ScriptExecutionContext*, const Vector<CustomElementInvocation>&);
 
     // You can just use toV8(Node*) to get correct wrapper objects,
     // even for custom elements.  Then generated
     // ElementWrapperFactories call V8CustomElement::wrap() with
     // proper prototype instances accordingly.
-    static v8::Handle<v8::Object> wrap(Element*, v8::Handle<v8::Object> creationContext, v8::Isolate*);
 
-    static bool hasDefinition(Element*);
+    typedef v8::Handle<v8::Object> (*CreateSVGWrapperFunction)(SVGElement*, v8::Handle<v8::Object> creationContext, v8::Isolate*);
+    typedef v8::Handle<v8::Object> (*CreateHTMLWrapperFunction)(HTMLElement*, v8::Handle<v8::Object> creationContext, v8::Isolate*);
+    class CreateWrapperFunction {

[dglazkov, 2013/05/01 16:51:22]

Effectively, CreateWrapperFunction carries the knowledge of which of the two
specific kinds of wrapper functions to call, allowing the callsite just call it
and expect the right thing to happen.

[dominicc (has gone to gerrit), 2013/05/02 01:29:56]

I added a brief comment. It's C++ man... in any reasonable language this would
be 3 lines of code. But as George Bernard Shaw said, "all progress depends on
unreasonable languages." Or something like that.

Once upgrade is happening I will tear into this; I think I can obviate the need
for this.

+    public:
+        explicit CreateWrapperFunction(CreateSVGWrapperFunction svg)
+            : m_svg(svg) { }
+        explicit CreateWrapperFunction(CreateHTMLWrapperFunction html)
+            : m_html(html) { }
+        v8::Handle<v8::Object> invoke(Element*, v8::Handle<v8::Object> creationContext, v8::Isolate*) const;
+    private:
+        CreateSVGWrapperFunction m_svg;
+        CreateHTMLWrapperFunction m_html;
+    };
+
+    static v8::Handle<v8::Object> wrap(Element*, v8::Handle<v8::Object> creationContext, v8::Isolate*, const CreateWrapperFunction& createTypeExtensionUpgradeCandidateWrapper);
+
+    static bool isCustomElement(Element*);
 
 private:
     static void invokeReadyCallbackIfNeeded(Element*, v8::Handle<v8::Context>);
-    static v8::Handle<v8::Object> createWrapper(PassRefPtr<Element>, v8::Handle<v8::Object>, v8::Isolate*);
+    static v8::Handle<v8::Object> createWrapper(PassRefPtr<Element>, v8::Handle<v8::Object>, v8::Isolate*, const CreateWrapperFunction& createTypeExtensionUpgradeCandidateWrapper);
+    static v8::Handle<v8::Object> createUpgradeCandidateWrapper(PassRefPtr<Element>, v8::Handle<v8::Object> creationContext, v8::Isolate*, const CreateWrapperFunction& createTypeExtensionUpgradeCandidateWrapper);

[dglazkov, 2013/05/01 16:51:22]

The new createUpgradeCandidateWrapper serves as the new fallback for custom
elements, instead of the standard HTML fallback that simply spits out
HTMLUnknownElement.

 };
 
-inline v8::Handle<v8::Object> CustomElementHelpers::wrap(Element* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
+inline v8::Handle<v8::Object> CustomElementHelpers::wrap(Element* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate, const CreateWrapperFunction& createWrapper)
 {
     ASSERT(impl);
     ASSERT(DOMDataStore::getWrapper(impl, isolate).IsEmpty());
-    return CustomElementHelpers::createWrapper(impl, creationContext, isolate);
-}
-
-inline bool CustomElementHelpers::hasDefinition(Element* element)
-{
-    CustomElementRegistry* registry = element->document()->registry();
-    if (registry && registry->findFor(element))
-        return 1;
-    return 0;
+    return CustomElementHelpers::createWrapper(impl, creationContext, isolate, createWrapper);
 }
 
 inline bool CustomElementHelpers::isValidPrototypeParameter(const ScriptValue& value, ScriptState* state)
 {
     AtomicString namespaceURI;
     return isValidPrototypeParameter(value, state, namespaceURI);
 }
 
 } // namespace WebCore
 
 #endif // CustomElementHelpers_h