Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / dom / DocumentInit.cpp

diff --git a/src/third_party/WebKit/Source/core/dom/DocumentInit.cpp b/src/third_party/WebKit/Source/core/dom/DocumentInit.cpp
index 7993f6c..0c3013a 100644 (file)
--- a/src/third_party/WebKit/Source/core/dom/DocumentInit.cpp
+++ b/src/third_party/WebKit/Source/core/dom/DocumentInit.cpp
@@ -68,6 +68,7 @@ DocumentInit::DocumentInit(const KURL& url, Frame* frame, WeakPtr<Document> cont
     , m_owner(ownerDocument(frame))
     , m_contextDocument(contextDocument)
     , m_import(import)
+    , m_createNewRegistrationContext(false)
 {
 }
 
@@ -79,6 +80,7 @@ DocumentInit::DocumentInit(const DocumentInit& other)
     , m_contextDocument(other.m_contextDocument)
     , m_import(other.m_import)
     , m_registrationContext(other.m_registrationContext)
+    , m_createNewRegistrationContext(other.m_createNewRegistrationContext)
 {
 }
 
@@ -125,23 +127,27 @@ KURL DocumentInit::parentBaseURL() const
 
 DocumentInit& DocumentInit::withRegistrationContext(CustomElementRegistrationContext* registrationContext)
 {
-    ASSERT(!m_registrationContext);
+    ASSERT(!m_createNewRegistrationContext && !m_registrationContext);
     m_registrationContext = registrationContext;
     return *this;
 }
 
-PassRefPtr<CustomElementRegistrationContext> DocumentInit::registrationContext(Document* document) const
+DocumentInit& DocumentInit::withNewRegistrationContext()
 {
-    if (!RuntimeEnabledFeatures::customElementsEnabled() && !RuntimeEnabledFeatures::embedderCustomElementsEnabled())
-        return 0;
+    ASSERT(!m_createNewRegistrationContext && !m_registrationContext);
+    m_createNewRegistrationContext = true;
+    return *this;
+}
 
+PassRefPtr<CustomElementRegistrationContext> DocumentInit::registrationContext(Document* document) const
+{
     if (!document->isHTMLDocument() && !document->isXHTMLDocument())
         return 0;
 
-    if (m_registrationContext)
-        return m_registrationContext.get();
+    if (m_createNewRegistrationContext)
+        return CustomElementRegistrationContext::create();
 
-    return CustomElementRegistrationContext::create();
+    return m_registrationContext.get();
 }
 
 WeakPtr<Document> DocumentInit::contextDocument() const