Implement custom element construction and some 'define' checks

third_party/WebKit/Source/core/dom/custom/V0CustomElementRegistry.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:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ 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 "core/dom/custom/V0CustomElementRegistry.h"
 
 #include "bindings/core/v8/V0CustomElementConstructorBuilder.h"
+#include "bindings/core/v8/V8Binding.h"
 #include "core/HTMLNames.h"
 #include "core/SVGNames.h"
+#include "core/dom/Document.h"
+#include "core/dom/custom/CustomElementsRegistry.h"
 #include "core/dom/custom/V0CustomElementException.h"
 #include "core/dom/custom/V0CustomElementRegistrationContext.h"
+#include "core/frame/LocalDOMWindow.h"
 
 namespace blink {
 
+static bool v1CustomElementIsDefined(const AtomicString& name)
+{
+    v8::Isolate* isolate = v8::Isolate::GetCurrent();

[haraken, 2016/05/10 09:04:22]

v8::Isolate::GetCurrent() is deprecated.

Can we pass a ScriptState from Document::registerElement down to this point?

+    Document* doc = toDocument(currentExecutionContext(isolate));
+    LocalDOMWindow* window = doc->domWindow();

[haraken, 2016/05/10 09:04:22]

We should use ScriptState::domWindow(), which does all necessary security
checks.

+    CustomElementsRegistry* registry = window->customElements();
+    return registry && registry->nameIsDefined(name);
+}
+
+bool V0CustomElementRegistry::nameIsDefined(const AtomicString& name) const
+{
+    return m_registeredTypeNames.contains(name);
+}
+
 V0CustomElementDefinition* V0CustomElementRegistry::registerElement(Document* document, V0CustomElementConstructorBuilder* constructorBuilder, const AtomicString& userSuppliedName, V0CustomElement::NameSet validNames, ExceptionState& exceptionState)
 {
     AtomicString type = userSuppliedName.lower();
 
     if (!constructorBuilder->isFeatureAllowed()) {
         V0CustomElementException::throwException(V0CustomElementException::CannotRegisterFromExtension, type, exceptionState);
         return 0;
     }
 
     if (!V0CustomElement::isValidName(type, validNames)) {
         V0CustomElementException::throwException(V0CustomElementException::InvalidName, type, exceptionState);
         return 0;
     }
 
-    if (m_registeredTypeNames.contains(type)) {
+    if (m_registeredTypeNames.contains(type) || v1CustomElementIsDefined(type)) {
         V0CustomElementException::throwException(V0CustomElementException::TypeAlreadyRegistered, type, exceptionState);
         return 0;
     }
 
     QualifiedName tagName = QualifiedName::null();
     if (!constructorBuilder->validateOptions(type, tagName, exceptionState))
         return 0;
 
     DCHECK(tagName.namespaceURI() == HTMLNames::xhtmlNamespaceURI || tagName.namespaceURI() == SVGNames::svgNamespaceURI);
 
@@ skipping 29 matching lines @@
 {
     return m_definitions.get(descriptor);
 }
 
 DEFINE_TRACE(V0CustomElementRegistry)
 {
     visitor->trace(m_definitions);
 }
 
 } // namespace blink