Changeset 280829 in webkit

Timestamp:

Aug 10, 2021, 2:19:23 AM (5 years ago)

Author:

Adrian Perez de Castro

Message:

Merge r273935 - "precustomized" state of custom elements can become HTMLUnknownElement
​https://bugs.webkit.org/show_bug.cgi?id=221652

Reviewed by Darin Adler.

The bug was caused by createJSHTMLWrapper in JSHTMLElementWrapperFactory.cpp relying on
!isCustomElementUpgradeCandidate() to create HTMLUnknownElement as JS wrapper of the element.

This is problematic after r266269 since that change re-purposes CustomElementState::Failed
on a custom element as "precustomized" state instead of introducing another enum value in
CustomElementState as RareDataBitFields has no more bits available.

This patch fixes the problem by introducing a new NodeFlag::IsUnknownElement and using that
to check whether JSHTMLUnknownElement should be created for a given element or not. Note that
HTMLElement had a virtual function, isHTMLUnknownElement, to check this condition but invoking
a virtual function proved to incur too much runtime cost.

• dom/Node.h:

(WebCore::Node::isUnknownElement const): Added.
(WebCore::Node::isHTMLUnknownElement const): Added.
(WebCore::Node::isSVGUnknownElement const): Added.
(WebCore::Node::isMathMLUnknownElement const): Added.
(WebCore::Node::NodeFlag): Added NodeFlag::IsUnknownElement.

• dom/make_names.pl:

(printWrapperFactoryCppFile): Treat the element as HTMLUnknownElement only if isUnknownElement
returns true instead of isCustomElementUpgradeCandidate returning false.

• html/HTMLElement.h:

(WebCore::HTMLElement::isHTMLUnknownElement const): Deleted.

• html/HTMLUnknownElement.h:
• mathml/MathMLElement.cpp:

(WebCore::MathMLElement::MathMLElement): Added ConstructionType as an argument.

• mathml/MathMLElement.h:
• mathml/MathMLUnknownElement.h:

(WebCore::MathMLUnknownElement::MathMLUnknownElement): Set NodeFlag::IsUnknownElement.

• svg/SVGElement.cpp:

(WebCore::SVGElement::SVGElement): Added ConstructionType as an argument.

• svg/SVGElement.h:
• svg/SVGUnknownElement.h:

(WebCore::SVGUnknownElement::SVGUnknownElement): Set NodeFlag::IsUnknownElement.

Location:

releases/WebKitGTK/webkit-2.32/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Node.h (modified) (2 diffs)
• dom/make_names.pl (modified) (1 diff)
• html/HTMLElement.h (modified) (1 diff)
• html/HTMLUnknownElement.h (modified) (1 diff)
• mathml/MathMLElement.cpp (modified) (1 diff)
• mathml/MathMLElement.h (modified) (1 diff)
• mathml/MathMLUnknownElement.h (modified) (1 diff)
• svg/SVGElement.cpp (modified) (1 diff)
• svg/SVGElement.h (modified) (1 diff)
• svg/SVGUnknownElement.h (modified) (1 diff)

releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-04  Ryosuke Niwa  <rniwa@webkit.org>
+
+        "precustomized" state of custom elements can become HTMLUnknownElement
+        https://bugs.webkit.org/show_bug.cgi?id=221652
+
+        Reviewed by Darin Adler.
+
+        The bug was caused by createJSHTMLWrapper in JSHTMLElementWrapperFactory.cpp relying on
+        !isCustomElementUpgradeCandidate() to create HTMLUnknownElement as JS wrapper of the element.
+
+        This is problematic after r266269 since that change re-purposes CustomElementState::Failed
+        on a custom element as "precustomized" state instead of introducing another enum value in
+        CustomElementState as RareDataBitFields has no more bits available.
+
+        This patch fixes the problem by introducing a new NodeFlag::IsUnknownElement and using that
+        to check whether JSHTMLUnknownElement should be created for a given element or not. Note that
+        HTMLElement had a virtual function, isHTMLUnknownElement, to check this condition but invoking
+        a virtual function proved to incur too much runtime cost.
+
+        * dom/Node.h:
+        (WebCore::Node::isUnknownElement const): Added.
+        (WebCore::Node::isHTMLUnknownElement const): Added.
+        (WebCore::Node::isSVGUnknownElement const): Added.
+        (WebCore::Node::isMathMLUnknownElement const): Added.
+        (WebCore::Node::NodeFlag): Added NodeFlag::IsUnknownElement.
+        * dom/make_names.pl:
+        (printWrapperFactoryCppFile): Treat the element as HTMLUnknownElement only if isUnknownElement
+        returns true instead of isCustomElementUpgradeCandidate returning false.
+        * html/HTMLElement.h:
+        (WebCore::HTMLElement::isHTMLUnknownElement const): Deleted.
+        * html/HTMLUnknownElement.h:
+        * mathml/MathMLElement.cpp:
+        (WebCore::MathMLElement::MathMLElement): Added ConstructionType as an argument.
+        * mathml/MathMLElement.h:
+        * mathml/MathMLUnknownElement.h:
+        (WebCore::MathMLUnknownElement::MathMLUnknownElement): Set NodeFlag::IsUnknownElement.
+        * svg/SVGElement.cpp:
+        (WebCore::SVGElement::SVGElement): Added ConstructionType as an argument.
+        * svg/SVGElement.h:
+        * svg/SVGUnknownElement.h:
+        (WebCore::SVGUnknownElement::SVGUnknownElement): Set NodeFlag::IsUnknownElement.
+
 2021-03-01  Chris Dumez  <cdumez@apple.com>
 

releases/WebKitGTK/webkit-2.32/Source/WebCore/dom/Node.h

@@ -194 +194 @@
     bool isMathMLElement() const { return hasNodeFlag(NodeFlag::IsMathMLElement); }
 
+    bool isUnknownElement() const { return hasNodeFlag(NodeFlag::IsUnknownElement); }
+    bool isHTMLUnknownElement() const { return isHTMLElement() && isUnknownElement(); }
+    bool isSVGUnknownElement() const { return isSVGElement() && isUnknownElement(); }
+    bool isMathMLUnknownElement() const { return isMathMLElement() && isUnknownElement(); }
+
     bool isPseudoElement() const { return pseudoId() != PseudoId::None; }
     bool isBeforePseudoElement() const { return pseudoId() == PseudoId::Before; }
@@ -536 +541 @@
         IsConnected = 1 << 10,
         IsInShadowTree = 1 << 11,
-        HasEventTargetData = 1 << 12,
-        // UnusedFlag = 1 << 13,
+        IsUnknownElement = 1 << 12,
+        HasEventTargetData = 1 << 13,
 
         // These bits are used by derived classes, pulled up here so they can

releases/WebKitGTK/webkit-2.32/Source/WebCore/dom/make_names.pl

@@ -1278 +1278 @@
     if ($parameters{customElementInterfaceName}) {
         print F <<END
-    if (element->isCustomElementUpgradeCandidate())
+    if (!element->isUnknownElement())
         return createWrapper<$parameters{customElementInterfaceName}>(globalObject, WTFMove(element));
+END
+;
+    }
+
+    if ("$parameters{namespace}Element" eq $parameters{fallbackJSInterfaceName}) {
+        print F <<END
+    ASSERT(element->is$parameters{fallbackJSInterfaceName}());
 END
 ;

releases/WebKitGTK/webkit-2.32/Source/WebCore/html/HTMLElement.h

@@ -87 +87 @@
     TextDirection directionalityIfhasDirAutoAttribute(bool& isAuto) const;
 
-    virtual bool isHTMLUnknownElement() const { return false; }
     virtual bool isTextControlInnerTextElement() const { return false; }
 

releases/WebKitGTK/webkit-2.32/Source/WebCore/html/HTMLUnknownElement.h

@@ -44 +44 @@
 private:
     HTMLUnknownElement(const QualifiedName& tagName, Document& document)
-        : HTMLElement(tagName, document, CreateHTMLElement)
+        : HTMLElement(tagName, document, CreateHTMLElement | NodeFlag::IsUnknownElement)
     {
     }
-
-    bool isHTMLUnknownElement() const final { return true; }
 };
 

releases/WebKitGTK/webkit-2.32/Source/WebCore/mathml/MathMLElement.cpp

@@ -51 +51 @@
 using namespace MathMLNames;
 
-MathMLElement::MathMLElement(const QualifiedName& tagName, Document& document)
-    : StyledElement(tagName, document, CreateMathMLElement)
+MathMLElement::MathMLElement(const QualifiedName& tagName, Document& document, ConstructionType constructionType)
+    : StyledElement(tagName, document, constructionType)
 {
 }

releases/WebKitGTK/webkit-2.32/Source/WebCore/mathml/MathMLElement.h

@@ -91 +91 @@
 
 protected:
-    MathMLElement(const QualifiedName& tagName, Document&);
+    MathMLElement(const QualifiedName& tagName, Document&, ConstructionType = CreateMathMLElement);
 
     void parseAttribute(const QualifiedName&, const AtomString&) override;

releases/WebKitGTK/webkit-2.32/Source/WebCore/mathml/MathMLUnknownElement.h

@@ -42 +42 @@
 private:
     MathMLUnknownElement(const QualifiedName& tagName, Document& document)
-        : MathMLElement(tagName, document)
+        : MathMLElement(tagName, document, CreateMathMLElement | NodeFlag::IsUnknownElement)
     {
     }

releases/WebKitGTK/webkit-2.32/Source/WebCore/svg/SVGElement.cpp

@@ -156 +156 @@
 }
 
-SVGElement::SVGElement(const QualifiedName& tagName, Document& document)
-    : StyledElement(tagName, document, CreateSVGElement)
+SVGElement::SVGElement(const QualifiedName& tagName, Document& document, ConstructionType constructionType)
+    : StyledElement(tagName, document, constructionType)
     , m_propertyAnimatorFactory(makeUnique<SVGPropertyAnimatorFactory>())
 {

releases/WebKitGTK/webkit-2.32/Source/WebCore/svg/SVGElement.h

@@ -148 +148 @@
 
 protected:
-    SVGElement(const QualifiedName&, Document&);
+    SVGElement(const QualifiedName&, Document&, ConstructionType = CreateSVGElement);
     virtual ~SVGElement();
 

releases/WebKitGTK/webkit-2.32/Source/WebCore/svg/SVGUnknownElement.h

@@ -46 +46 @@
 private:
     SVGUnknownElement(const QualifiedName& tagName, Document& document)
-        : SVGElement(tagName, document)
+        : SVGElement(tagName, document, CreateSVGElement | NodeFlag::IsUnknownElement)
     {
     }