Changeset 152290 in webkit

Timestamp:

Jul 2, 2013 6:48:16 AM (11 years ago)

Author:

kangil.han@samsung.com

Message:

is/toHTMLStyleElement should use Element* for its argument
​https://bugs.webkit.org/show_bug.cgi?id=118286

Reviewed by Andreas Kling.

To reduce unnecessary call of isElementNode(), this patch replaces argument
of is/toHTMLStyleElement from Node* to Element*. Plus, use Element::hasTagName
in collectActiveStyleSheets function for minor code refactoring since
its cost is cheaper than Node::hasTagName.

• css/CSSStyleSheet.cpp:

(WebCore::isAcceptableCSSStyleSheetParent):

• css/StyleScopeResolver.cpp:

(WebCore::StyleScopeResolver::scopeFor):

• dom/DocumentStyleSheetCollection.cpp:

(WebCore::DocumentStyleSheetCollection::collectActiveStyleSheets):

• dom/Node.cpp:

(WebCore::Node::numberOfScopedHTMLStyleChildren):

• html/HTMLStyleElement.h:

(WebCore::isHTMLStyleElement):
(WebCore::toHTMLStyleElement):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSStyleSheet.cpp (modified) (1 diff)
• css/StyleScopeResolver.cpp (modified) (1 diff)
• dom/DocumentStyleSheetCollection.cpp (modified) (3 diffs)
• dom/Node.cpp (modified) (1 diff)
• html/HTMLStyleElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-02  Kangil Han  <kangil.han@samsung.com>
+
+        is/toHTMLStyleElement should use Element* for its argument
+        https://bugs.webkit.org/show_bug.cgi?id=118286
+
+        Reviewed by Andreas Kling.
+
+        To reduce unnecessary call of isElementNode(), this patch replaces argument
+        of is/toHTMLStyleElement from Node* to Element*. Plus, use Element::hasTagName
+        in collectActiveStyleSheets function for minor code refactoring since
+        its cost is cheaper than Node::hasTagName.
+
+        * css/CSSStyleSheet.cpp:
+        (WebCore::isAcceptableCSSStyleSheetParent):
+        * css/StyleScopeResolver.cpp:
+        (WebCore::StyleScopeResolver::scopeFor):
+        * dom/DocumentStyleSheetCollection.cpp:
+        (WebCore::DocumentStyleSheetCollection::collectActiveStyleSheets):
+        * dom/Node.cpp:
+        (WebCore::Node::numberOfScopedHTMLStyleChildren):
+        * html/HTMLStyleElement.h:
+        (WebCore::isHTMLStyleElement):
+        (WebCore::toHTMLStyleElement):
+
 2013-07-02  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/css/CSSStyleSheet.cpp

@@ -66 +66 @@
         || parentNode->isDocumentNode()
         || parentNode->hasTagName(HTMLNames::linkTag)
-        || isHTMLStyleElement(parentNode)
+        || (parentNode->isElementNode() && isHTMLStyleElement(toElement(parentNode)))
 #if ENABLE(SVG)
         || parentNode->hasTagName(SVGNames::styleTag)

trunk/Source/WebCore/css/StyleScopeResolver.cpp

@@ -61 +61 @@
         return 0;
     Node* ownerNode = sheet->ownerNode();
-    if (!ownerNode || !ownerNode->isHTMLElement() || !isHTMLStyleElement(ownerNode))
-        return 0;
-
-    HTMLStyleElement* styleElement = toHTMLStyleElement(ownerNode);
+    if (!ownerNode || !ownerNode->isHTMLElement() || !isHTMLStyleElement(toElement(ownerNode)))
+        return 0;
+
+    HTMLStyleElement* styleElement = toHTMLStyleElement(toElement(ownerNode));
     if (!styleElement->scoped())
         return styleElement->isInShadowTree() ? styleElement->containingShadowRoot() : 0;

trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp

@@ -300 +300 @@
             AtomicString title = e->getAttribute(titleAttr);
             bool enabledViaScript = false;
-            if (e->hasLocalName(linkTag)) {
+            if (e->hasTagName(linkTag)) {
                 // <LINK> element
                 HTMLLinkElement* linkElement = static_cast<HTMLLinkElement*>(n);
@@ -323 +323 @@
             // set of sheets that will be enabled.
 #if ENABLE(SVG)
-            if (n->isSVGElement() && n->hasTagName(SVGNames::styleTag))
+            if (e->hasTagName(SVGNames::styleTag))
                 sheet = static_cast<SVGStyleElement*>(n)->sheet();
             else
 #endif
-            if (e->hasLocalName(linkTag))
-                sheet = static_cast<HTMLLinkElement*>(n)->sheet();
-            else
-                // <STYLE> element
-                sheet = toHTMLStyleElement(n)->sheet();
+            {
+                if (e->hasTagName(linkTag))
+                    sheet = static_cast<HTMLLinkElement*>(n)->sheet();
+                else
+                    // <STYLE> element
+                    sheet = toHTMLStyleElement(e)->sheet();
+            }
             // Check to see if this sheet belongs to a styleset
             // (thus making it PREFERRED or ALTERNATE rather than
@@ -343 +345 @@
                     // us as the preferred set. Otherwise, just ignore
                     // this sheet.
-                    if (e->hasLocalName(styleTag) || !rel.contains("alternate"))
+                    if (e->hasTagName(styleTag) || !rel.contains("alternate"))
                         m_preferredStylesheetSetName = m_selectedStylesheetSetName = title;
                 }

trunk/Source/WebCore/dom/Node.cpp

@@ -2531 +2531 @@
 {
     size_t count = 0;
-    for (Node* child = firstChild(); child; child = child->nextSibling()) {
-        if (isHTMLStyleElement(child) && toHTMLStyleElement(child)->isRegisteredAsScoped())
+    for (Element* element = ElementTraversal::firstWithin(this); element; element = ElementTraversal::next(element, this)) {
+        if (isHTMLStyleElement(element) && toHTMLStyleElement(element)->isRegisteredAsScoped())
             count++;
     }

trunk/Source/WebCore/html/HTMLStyleElement.h

@@ -98 +98 @@
 };
 
-inline bool isHTMLStyleElement(Node* node)
+inline bool isHTMLStyleElement(Element* element)
 {
-    return node->hasTagName(HTMLNames::styleTag);
+    return element->hasTagName(HTMLNames::styleTag);
 }
 
-inline HTMLStyleElement* toHTMLStyleElement(Node* node)
+inline HTMLStyleElement* toHTMLStyleElement(Element* element)
 {
-    ASSERT_WITH_SECURITY_IMPLICATION(!node || isHTMLStyleElement(node));
-    return static_cast<HTMLStyleElement*>(node);
+    ASSERT_WITH_SECURITY_IMPLICATION(!element || isHTMLStyleElement(element));
+    return static_cast<HTMLStyleElement*>(element);
 }