Split CustomElementRegistry into a registration context and a registry.

Source/bindings/v8/CustomElementWrapper.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 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/v8/CustomElementWrapper.h"
 
+#include "V8HTMLElement.h"
 #include "V8HTMLElementWrapperFactory.h"
+#include "V8SVGElement.h"
 #include "V8SVGElementWrapperFactory.h"
 #include "bindings/v8/DOMDataStore.h"
 #include "bindings/v8/V8PerContextData.h"
-#include "core/dom/CustomElementRegistry.h"
+#include "core/dom/CustomElementRegistrationContext.h"
 #include "core/html/HTMLElement.h"
 #include "core/html/HTMLUnknownElement.h"
 #include "core/svg/SVGElement.h"
 
 namespace WebCore {
 
 template<typename ElementType>
 v8::Handle<v8::Object> createDirectWrapper(ElementType*, v8::Handle<v8::Object> creationContext, v8::Isolate*);
 
 template<>
@@ skipping 19 matching lines @@
 
 template<>
 v8::Handle<v8::Object> createFallbackWrapper<SVGElement>(SVGElement* element, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
 {
     return createV8SVGFallbackWrapper(element, creationContext, isolate);
 }
 
 template<typename ElementType>
 v8::Handle<v8::Object> createUpgradeCandidateWrapper(ElementType* element, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate, v8::Handle<v8::Object> (*createSpecificWrapper)(ElementType* element, v8::Handle<v8::Object> creationContext, v8::Isolate*))
 {
-    if (CustomElementRegistry::isCustomTagName(element->localName()))
+    if (CustomElementRegistrationContext::isCustomTagName(element->localName()))
         return createDirectWrapper(element, creationContext, isolate);
     if (createSpecificWrapper)
         return createSpecificWrapper(element, creationContext, isolate);
     return createFallbackWrapper(element, creationContext, isolate);
 }
 
-template<typename ElementType>
-v8::Handle<v8::Object> CustomElementWrapper<ElementType>::wrap(PassRefPtr<ElementType> element, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate, v8::Handle<v8::Object> (*createSpecificWrapper)(ElementType* element, v8::Handle<v8::Object> creationContext, v8::Isolate*))
+template<typename ElementType, typename WrapperType>
+v8::Handle<v8::Object> CustomElementWrapper<ElementType, WrapperType>::wrap(PassRefPtr<ElementType> element, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate, v8::Handle<v8::Object> (*createSpecificWrapper)(ElementType* element, v8::Handle<v8::Object> creationContext, v8::Isolate*))
 {
     ASSERT(DOMDataStore::getWrapper<V8Element>(element.get(), isolate).IsEmpty());
 
     // FIXME: creationContext.IsEmpty() should never happen. Remove
     // this when callers (like InspectorController::inspect) are fixed
     // to never pass an empty creation context.
     v8::Handle<v8::Context> context = creationContext.IsEmpty() ? isolate->GetCurrentContext() : creationContext->CreationContext();
 
-    CustomElementRegistry* registry = element->document()->registry();
-    RefPtr<CustomElementDefinition> definition = registry->findFor(element.get());
-    if (!element->isUpgradedCustomElement() || !definition)
+    if (!element->isUpgradedCustomElement())
         return createUpgradeCandidateWrapper(element.get(), creationContext, isolate, createSpecificWrapper);
 
     V8PerContextData* perContextData = V8PerContextData::from(context);
     if (!perContextData)
         return v8::Handle<v8::Object>();
 
-    CustomElementBinding* customElementBinding = perContextData->customElementBinding(definition->descriptor().type());
+    CustomElementDescriptor descriptor = element->document()->registrationContext()->describe(element.get());
+    CustomElementBinding* binding = perContextData->customElementBinding(descriptor.type());
 
-    v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, customElementBinding->wrapperType(), element.get(), isolate);
+    v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, binding->wrapperType(), element.get(), isolate);
     if (wrapper.IsEmpty())
         return v8::Handle<v8::Object>();
 
-    wrapper->SetPrototype(customElementBinding->prototype());
+    wrapper->SetPrototype(binding->prototype());
 
-    V8DOMWrapper::associateObjectWithWrapper<V8Element>(element, customElementBinding->wrapperType(), wrapper, isolate, WrapperConfiguration::Dependent);
+    V8DOMWrapper::associateObjectWithWrapper<WrapperType>(element, binding->wrapperType(), wrapper, isolate, WrapperConfiguration::Dependent);
     return wrapper;
 }
 
 template
-class CustomElementWrapper<HTMLElement>;
+class CustomElementWrapper<HTMLElement, V8HTMLElement>;
 
 template
-class CustomElementWrapper<SVGElement>;
+class CustomElementWrapper<SVGElement, V8SVGElement>;
 
 } // namespace WebCore