Use is<SVG*Element>() instead of isSVG*Element()

https://bugs.webkit.org/show_bug.cgi?id=137058

Reviewed by Dirk Schulze.

Use is<SVG*Element>() instead of isSVG*Element() and drop support for
generated isSVG*Element().

No new tests, no behavior change.

* css/CSSCursorImageValue.cpp:
(WebCore::resourceReferencedByCursorElement):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::useSVGZoomRulesForLength):
* dom/DocumentStyleSheetCollection.cpp:
(WebCore::DocumentStyleSheetCollection::collectActiveStyleSheets):
* dom/ScriptElement.cpp:
(WebCore::toScriptElementIfPossible):
* dom/make_names.pl:
(printTypeHelpers):
* editing/gtk/EditorGtk.cpp:
(WebCore::elementURL):
* rendering/HitTestResult.cpp:
(WebCore::HitTestResult::absoluteImageURL):
(WebCore::HitTestResult::isLiveLink):
* rendering/svg/RenderSVGEllipse.cpp:
(WebCore::RenderSVGEllipse::calculateRadiiAndCenter):
* rendering/svg/RenderSVGTransformableContainer.cpp:
(WebCore::RenderSVGTransformableContainer::calculateLocalTransform):
* rendering/svg/SVGPathData.cpp:
(WebCore::updatePathFromCircleElement):
* rendering/svg/SVGRenderTreeAsText.cpp:
(WebCore::operator<<):
* rendering/svg/SVGResources.cpp:
(WebCore::targetReferenceFromResource):
* svg/SVGAltGlyphDefElement.cpp:
(WebCore::SVGAltGlyphDefElement::hasValidGlyphElements):
* svg/SVGAltGlyphElement.cpp:
(WebCore::SVGAltGlyphElement::hasValidGlyphElements):
* svg/SVGAnimateMotionElement.cpp:
(WebCore::SVGAnimateMotionElement::hasValidAttributeType):
* svg/SVGDocument.cpp:
(WebCore::SVGDocument::rootElement):
* svg/SVGElement.cpp:
(WebCore::SVGElement::isOutermostSVGSVGElement):
(WebCore::SVGElement::ownerSVGElement):
(WebCore::SVGElement::viewportElement):
* svg/SVGFEComponentTransferElement.cpp:
(WebCore::SVGFEComponentTransferElement::build):
* svg/SVGFELightElement.cpp:
(WebCore::SVGFELightElement::findLightElement):
* svg/SVGFontData.cpp:
(WebCore::SVGFontData::applySVGGlyphSelection):
* svg/SVGFontElement.cpp:
(WebCore::SVGFontElement::ensureGlyphCache):
* svg/SVGFontFaceElement.cpp:
(WebCore::SVGFontFaceElement::associatedFontElement):
(WebCore::SVGFontFaceElement::rebuildFontFace):
* svg/SVGFontFaceSrcElement.cpp:
(WebCore::SVGFontFaceSrcElement::srcValue):
(WebCore::SVGFontFaceSrcElement::childrenChanged):
* svg/SVGGlyphElement.cpp:
(WebCore::SVGGlyphElement::invalidateGlyphCache):
* svg/SVGHKernElement.cpp:
(WebCore::SVGHKernElement::insertedInto):
(WebCore::SVGHKernElement::removedFrom):
* svg/SVGLengthContext.cpp:
(WebCore::SVGLengthContext::determineViewport):
* svg/SVGLocatable.cpp:
(WebCore::isViewportElement):
* svg/SVGMPathElement.cpp:
(WebCore::SVGMPathElement::pathElement):
(WebCore::SVGMPathElement::notifyParentOfPathChange):
* svg/SVGPathElement.cpp:
(WebCore::SVGPathElement::invalidateMPathDependencies):
* svg/SVGPatternElement.cpp:
(WebCore::SVGPatternElement::collectPatternAttributes):
* svg/SVGSVGElement.cpp:
(WebCore::SVGSVGElement::setupInitialView):
* svg/SVGUseElement.cpp:
(WebCore::dumpInstanceTree):
(WebCore::SVGUseElement::expandUseElementsInShadowTree):
* svg/SVGVKernElement.cpp:
(WebCore::SVGVKernElement::insertedInto):
(WebCore::SVGVKernElement::removedFrom):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@173921 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index d4f0a1d..9a13b19 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,91 @@
+2014-09-24  Christophe Dumez  <cdumez@apple.com>
+
+        Use is<SVG*Element>() instead of isSVG*Element()
+        https://bugs.webkit.org/show_bug.cgi?id=137058
+
+        Reviewed by Dirk Schulze.
+
+        Use is<SVG*Element>() instead of isSVG*Element() and drop support for
+        generated isSVG*Element().
+
+        No new tests, no behavior change.
+
+        * css/CSSCursorImageValue.cpp:
+        (WebCore::resourceReferencedByCursorElement):
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::useSVGZoomRulesForLength):
+        * dom/DocumentStyleSheetCollection.cpp:
+        (WebCore::DocumentStyleSheetCollection::collectActiveStyleSheets):
+        * dom/ScriptElement.cpp:
+        (WebCore::toScriptElementIfPossible):
+        * dom/make_names.pl:
+        (printTypeHelpers):
+        * editing/gtk/EditorGtk.cpp:
+        (WebCore::elementURL):
+        * rendering/HitTestResult.cpp:
+        (WebCore::HitTestResult::absoluteImageURL):
+        (WebCore::HitTestResult::isLiveLink):
+        * rendering/svg/RenderSVGEllipse.cpp:
+        (WebCore::RenderSVGEllipse::calculateRadiiAndCenter):
+        * rendering/svg/RenderSVGTransformableContainer.cpp:
+        (WebCore::RenderSVGTransformableContainer::calculateLocalTransform):
+        * rendering/svg/SVGPathData.cpp:
+        (WebCore::updatePathFromCircleElement):
+        * rendering/svg/SVGRenderTreeAsText.cpp:
+        (WebCore::operator<<):
+        * rendering/svg/SVGResources.cpp:
+        (WebCore::targetReferenceFromResource):
+        * svg/SVGAltGlyphDefElement.cpp:
+        (WebCore::SVGAltGlyphDefElement::hasValidGlyphElements):
+        * svg/SVGAltGlyphElement.cpp:
+        (WebCore::SVGAltGlyphElement::hasValidGlyphElements):
+        * svg/SVGAnimateMotionElement.cpp:
+        (WebCore::SVGAnimateMotionElement::hasValidAttributeType):
+        * svg/SVGDocument.cpp:
+        (WebCore::SVGDocument::rootElement):
+        * svg/SVGElement.cpp:
+        (WebCore::SVGElement::isOutermostSVGSVGElement):
+        (WebCore::SVGElement::ownerSVGElement):
+        (WebCore::SVGElement::viewportElement):
+        * svg/SVGFEComponentTransferElement.cpp:
+        (WebCore::SVGFEComponentTransferElement::build):
+        * svg/SVGFELightElement.cpp:
+        (WebCore::SVGFELightElement::findLightElement):
+        * svg/SVGFontData.cpp:
+        (WebCore::SVGFontData::applySVGGlyphSelection):
+        * svg/SVGFontElement.cpp:
+        (WebCore::SVGFontElement::ensureGlyphCache):
+        * svg/SVGFontFaceElement.cpp:
+        (WebCore::SVGFontFaceElement::associatedFontElement):
+        (WebCore::SVGFontFaceElement::rebuildFontFace):
+        * svg/SVGFontFaceSrcElement.cpp:
+        (WebCore::SVGFontFaceSrcElement::srcValue):
+        (WebCore::SVGFontFaceSrcElement::childrenChanged):
+        * svg/SVGGlyphElement.cpp:
+        (WebCore::SVGGlyphElement::invalidateGlyphCache):
+        * svg/SVGHKernElement.cpp:
+        (WebCore::SVGHKernElement::insertedInto):
+        (WebCore::SVGHKernElement::removedFrom):
+        * svg/SVGLengthContext.cpp:
+        (WebCore::SVGLengthContext::determineViewport):
+        * svg/SVGLocatable.cpp:
+        (WebCore::isViewportElement):
+        * svg/SVGMPathElement.cpp:
+        (WebCore::SVGMPathElement::pathElement):
+        (WebCore::SVGMPathElement::notifyParentOfPathChange):
+        * svg/SVGPathElement.cpp:
+        (WebCore::SVGPathElement::invalidateMPathDependencies):
+        * svg/SVGPatternElement.cpp:
+        (WebCore::SVGPatternElement::collectPatternAttributes):
+        * svg/SVGSVGElement.cpp:
+        (WebCore::SVGSVGElement::setupInitialView):
+        * svg/SVGUseElement.cpp:
+        (WebCore::dumpInstanceTree):
+        (WebCore::SVGUseElement::expandUseElementsInShadowTree):
+        * svg/SVGVKernElement.cpp:
+        (WebCore::SVGVKernElement::insertedInto):
+        (WebCore::SVGVKernElement::removedFrom):
+
 2014-09-24  Benjamin Poulain  <bpoulain@apple.com>
 
         Remove the style marking from :nth-child()

diff --git a/Source/WebCore/css/CSSCursorImageValue.cpp b/Source/WebCore/css/CSSCursorImageValue.cpp
index 91e7d02..586b8fd 100644 (file)
--- a/Source/WebCore/css/CSSCursorImageValue.cpp
+++ b/Source/WebCore/css/CSSCursorImageValue.cpp
@@ -47,7 +47,7 @@ namespace WebCore {
 static inline SVGCursorElement* resourceReferencedByCursorElement(const String& url, Document& document)
 {
     Element* element = SVGURIReference::targetElementFromIRIString(url, document);
-    if (element && isSVGCursorElement(element))
+    if (element && is<SVGCursorElement>(element))
         return downcast<SVGCursorElement>(element);
 
     return nullptr;

diff --git a/Source/WebCore/css/StyleResolver.cpp b/Source/WebCore/css/StyleResolver.cpp
index 16d267b..2eaed53 100644 (file)
--- a/Source/WebCore/css/StyleResolver.cpp
+++ b/Source/WebCore/css/StyleResolver.cpp
@@ -1883,7 +1883,7 @@ bool StyleResolver::useSVGZoomRules()
 // Scale with/height properties on inline SVG root.
 bool StyleResolver::useSVGZoomRulesForLength()
 {
-    return m_state.element() && m_state.element()->isSVGElement() && !(isSVGSVGElement(m_state.element()) && m_state.element()->parentNode());
+    return m_state.element() && m_state.element()->isSVGElement() && !(is<SVGSVGElement>(m_state.element()) && m_state.element()->parentNode());
 }
 
 #if ENABLE(CSS_GRID_LAYOUT)

diff --git a/Source/WebCore/dom/DocumentStyleSheetCollection.cpp b/Source/WebCore/dom/DocumentStyleSheetCollection.cpp
index 61d99a7..889ae62 100644 (file)
--- a/Source/WebCore/dom/DocumentStyleSheetCollection.cpp
+++ b/Source/WebCore/dom/DocumentStyleSheetCollection.cpp
@@ -305,7 +305,7 @@ void DocumentStyleSheetCollection::collectActiveStyleSheets(Vector<RefPtr<StyleS
             }
             // Get the current preferred styleset. This is the
             // set of sheets that will be enabled.
-            if (isSVGStyleElement(element))
+            if (is<SVGStyleElement>(element))
                 sheet = downcast<SVGStyleElement>(element).sheet();
             else if (isHTMLLinkElement(element))
                 sheet = downcast<HTMLLinkElement>(element).sheet();

diff --git a/Source/WebCore/dom/ScriptElement.cpp b/Source/WebCore/dom/ScriptElement.cpp
index e3056c3..a5c2d32 100644 (file)
--- a/Source/WebCore/dom/ScriptElement.cpp
+++ b/Source/WebCore/dom/ScriptElement.cpp
@@ -385,7 +385,7 @@ ScriptElement* toScriptElementIfPossible(Element* element)
     if (isHTMLScriptElement(element))
         return downcast<HTMLScriptElement>(element);
 
-    if (isSVGScriptElement(element))
+    if (is<SVGScriptElement>(element))
         return downcast<SVGScriptElement>(element);
 
     return nullptr;

diff --git a/Source/WebCore/dom/make_names.pl b/Source/WebCore/dom/make_names.pl
index d8f90cd..18a71f8 100755 (executable)
--- a/Source/WebCore/dom/make_names.pl
+++ b/Source/WebCore/dom/make_names.pl
@@ -657,12 +657,16 @@ END
        }
        print F <<END
 };
-
+END
+       ;
+       if ($parameters{namespace} eq "HTML") {
+           print F <<END
 // FIXME: Remove these macros once the code has been ported to using
 // is<*Element>().
 #define is$class(x) WebCore::is<WebCore::$class>(x)
 END
-        ;
+           ;
+        }
         print F "\n";
     }
 }

diff --git a/Source/WebCore/editing/gtk/EditorGtk.cpp b/Source/WebCore/editing/gtk/EditorGtk.cpp
index c772ec6..fe0b1da 100644 (file)
--- a/Source/WebCore/editing/gtk/EditorGtk.cpp
+++ b/Source/WebCore/editing/gtk/EditorGtk.cpp
@@ -84,7 +84,7 @@ static const AtomicString& elementURL(Element& element)
 {
     if (isHTMLImageElement(element) || isHTMLInputElement(element))
         return element.fastGetAttribute(HTMLNames::srcAttr);
-    if (isSVGImageElement(element))
+    if (is<SVGImageElement>(element))
         return element.fastGetAttribute(XLinkNames::hrefAttr);
     if (isHTMLEmbedElement(element) || isHTMLObjectElement(element))
         return element.imageSourceURL();

diff --git a/Source/WebCore/rendering/HitTestResult.cpp b/Source/WebCore/rendering/HitTestResult.cpp
index 695b257..0cc4550 100644 (file)
--- a/Source/WebCore/rendering/HitTestResult.cpp
+++ b/Source/WebCore/rendering/HitTestResult.cpp
@@ -321,7 +321,7 @@ URL HitTestResult::absoluteImageURL() const
         || isHTMLImageElement(m_innerNonSharedNode.get())
         || isHTMLInputElement(m_innerNonSharedNode.get())
         || m_innerNonSharedNode->hasTagName(objectTag)
-        || isSVGImageElement(m_innerNonSharedNode.get())) 
+        || is<SVGImageElement>(m_innerNonSharedNode.get()))
         {
         Element* element = toElement(m_innerNonSharedNode.get());
         urlString = element->imageSourceURL();
@@ -521,7 +521,7 @@ bool HitTestResult::isLiveLink() const
     if (isHTMLAnchorElement(*m_innerURLElement))
         return downcast<HTMLAnchorElement>(*m_innerURLElement).isLiveLink();
 
-    if (isSVGAElement(*m_innerURLElement))
+    if (is<SVGAElement>(*m_innerURLElement))
         return m_innerURLElement->isLink();
 
     return false;

diff --git a/Source/WebCore/rendering/svg/RenderSVGEllipse.cpp b/Source/WebCore/rendering/svg/RenderSVGEllipse.cpp
index 1d6b335..f166e00 100644 (file)
--- a/Source/WebCore/rendering/svg/RenderSVGEllipse.cpp
+++ b/Source/WebCore/rendering/svg/RenderSVGEllipse.cpp
@@ -81,13 +81,13 @@ void RenderSVGEllipse::calculateRadiiAndCenter()
     m_center = FloatPoint(
         lengthContext.valueForLength(style().svgStyle().cx(), LengthModeWidth),
         lengthContext.valueForLength(style().svgStyle().cy(), LengthModeHeight));
-    if (isSVGCircleElement(graphicsElement())) {
+    if (is<SVGCircleElement>(graphicsElement())) {
         float radius = lengthContext.valueForLength(style().svgStyle().r());
         m_radii = FloatSize(radius, radius);
         return;
     }
 
-    ASSERT(isSVGEllipseElement(graphicsElement()));
+    ASSERT(is<SVGEllipseElement>(graphicsElement()));
     m_radii = FloatSize(
         lengthContext.valueForLength(style().svgStyle().rx(), LengthModeWidth),
         lengthContext.valueForLength(style().svgStyle().ry(), LengthModeHeight));

diff --git a/Source/WebCore/rendering/svg/RenderSVGTransformableContainer.cpp b/Source/WebCore/rendering/svg/RenderSVGTransformableContainer.cpp
index 85fd8b5..90ba8a0 100644 (file)
--- a/Source/WebCore/rendering/svg/RenderSVGTransformableContainer.cpp
+++ b/Source/WebCore/rendering/svg/RenderSVGTransformableContainer.cpp
@@ -42,11 +42,11 @@ bool RenderSVGTransformableContainer::calculateLocalTransform()
     // tree, that was created during the use/symbol/svg expansion in SVGUseElement. These containers
     // need to respect the translations induced by their corresponding use elements x/y attributes.
     SVGUseElement* useElement = nullptr;
-    if (isSVGUseElement(element))
+    if (is<SVGUseElement>(element))
         useElement = &downcast<SVGUseElement>(element);
-    else if (element.isInShadowTree() && isSVGGElement(element)) {
+    else if (element.isInShadowTree() && is<SVGGElement>(element)) {
         SVGElement* correspondingElement = element.correspondingElement();
-        if (correspondingElement && isSVGUseElement(correspondingElement))
+        if (correspondingElement && is<SVGUseElement>(correspondingElement))
             useElement = downcast<SVGUseElement>(correspondingElement);
     }
 

diff --git a/Source/WebCore/rendering/svg/SVGPathData.cpp b/Source/WebCore/rendering/svg/SVGPathData.cpp
index 870f48b..2743f52 100644 (file)
--- a/Source/WebCore/rendering/svg/SVGPathData.cpp
+++ b/Source/WebCore/rendering/svg/SVGPathData.cpp
@@ -39,7 +39,7 @@ namespace WebCore {
 
 static void updatePathFromCircleElement(SVGElement* element, Path& path)
 {
-    ASSERT(isSVGCircleElement(element));
+    ASSERT(is<SVGCircleElement>(element));
 
     SVGLengthContext lengthContext(element);
     RenderElement* renderer = element->renderer();

diff --git a/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp b/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp
index ef2b9ac..4386c8c 100644 (file)
--- a/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp
+++ b/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp
@@ -320,25 +320,25 @@ static TextStream& operator<<(TextStream& ts, const RenderSVGShape& shape)
     SVGGraphicsElement& svgElement = shape.graphicsElement();
     SVGLengthContext lengthContext(&svgElement);
 
-    if (isSVGRectElement(svgElement)) {
+    if (is<SVGRectElement>(svgElement)) {
         const SVGRectElement& element = downcast<SVGRectElement>(svgElement);
         writeNameValuePair(ts, "x", element.x().value(lengthContext));
         writeNameValuePair(ts, "y", element.y().value(lengthContext));
         writeNameValuePair(ts, "width", element.width().value(lengthContext));
         writeNameValuePair(ts, "height", element.height().value(lengthContext));
-    } else if (isSVGLineElement(svgElement)) {
+    } else if (is<SVGLineElement>(svgElement)) {
         const SVGLineElement& element = downcast<SVGLineElement>(svgElement);
         writeNameValuePair(ts, "x1", element.x1().value(lengthContext));
         writeNameValuePair(ts, "y1", element.y1().value(lengthContext));
         writeNameValuePair(ts, "x2", element.x2().value(lengthContext));
         writeNameValuePair(ts, "y2", element.y2().value(lengthContext));
-    } else if (isSVGEllipseElement(svgElement)) {
+    } else if (is<SVGEllipseElement>(svgElement)) {
         const SVGEllipseElement& element = downcast<SVGEllipseElement>(svgElement);
         writeNameValuePair(ts, "cx", element.cx().value(lengthContext));
         writeNameValuePair(ts, "cy", element.cy().value(lengthContext));
         writeNameValuePair(ts, "rx", element.rx().value(lengthContext));
         writeNameValuePair(ts, "ry", element.ry().value(lengthContext));
-    } else if (isSVGCircleElement(svgElement)) {
+    } else if (is<SVGCircleElement>(svgElement)) {
         const SVGCircleElement& element = downcast<SVGCircleElement>(svgElement);
         writeNameValuePair(ts, "cx", element.cx().value(lengthContext));
         writeNameValuePair(ts, "cy", element.cy().value(lengthContext));
@@ -346,7 +346,7 @@ static TextStream& operator<<(TextStream& ts, const RenderSVGShape& shape)
     } else if (svgElement.hasTagName(SVGNames::polygonTag) || svgElement.hasTagName(SVGNames::polylineTag)) {
         const SVGPolyElement& element = toSVGPolyElement(svgElement);
         writeNameAndQuotedValue(ts, "points", element.pointList().valueAsString());
-    } else if (isSVGPathElement(svgElement)) {
+    } else if (is<SVGPathElement>(svgElement)) {
         const SVGPathElement& element = downcast<SVGPathElement>(svgElement);
         String pathString;
         // FIXME: We should switch to UnalteredParsing here - this will affect the path dumping output of dozens of tests.

diff --git a/Source/WebCore/rendering/svg/SVGResources.cpp b/Source/WebCore/rendering/svg/SVGResources.cpp
index 8cdc862..570986e 100644 (file)
--- a/Source/WebCore/rendering/svg/SVGResources.cpp
+++ b/Source/WebCore/rendering/svg/SVGResources.cpp
@@ -141,11 +141,11 @@ static HashSet<AtomicString>& chainableResourceTags()
 static inline String targetReferenceFromResource(SVGElement& element)
 {
     String target;
-    if (isSVGPatternElement(element))
+    if (is<SVGPatternElement>(element))
         target = downcast<SVGPatternElement>(element).href();
     else if (isSVGGradientElement(element))
         target = toSVGGradientElement(element).href();
-    else if (isSVGFilterElement(element))
+    else if (is<SVGFilterElement>(element))
         target = downcast<SVGFilterElement>(element).href();
     else
         ASSERT_NOT_REACHED();

diff --git a/Source/WebCore/svg/SVGAltGlyphDefElement.cpp b/Source/WebCore/svg/SVGAltGlyphDefElement.cpp
index 620117d..988800b 100644 (file)
--- a/Source/WebCore/svg/SVGAltGlyphDefElement.cpp
+++ b/Source/WebCore/svg/SVGAltGlyphDefElement.cpp
@@ -90,7 +90,7 @@ bool SVGAltGlyphDefElement::hasValidGlyphElements(Vector<String>& glyphNames) co
     bool foundFirstAltGlyphItem = false;
 
     for (auto& child : childrenOfType<SVGElement>(*this)) {
-        if (!foundFirstAltGlyphItem && isSVGGlyphRefElement(child)) {
+        if (!foundFirstAltGlyphItem && is<SVGGlyphRefElement>(child)) {
             fountFirstGlyphRef = true;
             String referredGlyphName;
 
@@ -104,7 +104,7 @@ bool SVGAltGlyphDefElement::hasValidGlyphElements(Vector<String>& glyphNames) co
                 glyphNames.clear();
                 return false;
             }
-        } else if (!fountFirstGlyphRef && isSVGAltGlyphItemElement(child)) {
+        } else if (!fountFirstGlyphRef && is<SVGAltGlyphItemElement>(child)) {
             foundFirstAltGlyphItem = true;
 
             // As the spec says "The first 'altGlyphItem' in which all referenced glyphs

diff --git a/Source/WebCore/svg/SVGAltGlyphElement.cpp b/Source/WebCore/svg/SVGAltGlyphElement.cpp
index c7b342e..a6f07b8 100644 (file)
--- a/Source/WebCore/svg/SVGAltGlyphElement.cpp
+++ b/Source/WebCore/svg/SVGAltGlyphElement.cpp
@@ -94,12 +94,12 @@ bool SVGAltGlyphElement::hasValidGlyphElements(Vector<String>& glyphNames) const
     if (!element)
         return false;
 
-    if (isSVGGlyphElement(element)) {
+    if (is<SVGGlyphElement>(element)) {
         glyphNames.append(target);
         return true;
     }
 
-    if (isSVGAltGlyphDefElement(element)
+    if (is<SVGAltGlyphDefElement>(element)
         && downcast<SVGAltGlyphDefElement>(*element).hasValidGlyphElements(glyphNames))
         return true;
 

diff --git a/Source/WebCore/svg/SVGAnimateMotionElement.cpp b/Source/WebCore/svg/SVGAnimateMotionElement.cpp
index 0a983df..855a238 100644 (file)
--- a/Source/WebCore/svg/SVGAnimateMotionElement.cpp
+++ b/Source/WebCore/svg/SVGAnimateMotionElement.cpp
@@ -72,7 +72,7 @@ bool SVGAnimateMotionElement::hasValidAttributeType()
     if (targetElement->hasTagName(gTag)
         || targetElement->hasTagName(defsTag)
         || targetElement->hasTagName(useTag)
-        || isSVGImageElement(targetElement)
+        || is<SVGImageElement>(targetElement)
         || targetElement->hasTagName(switchTag)
         || targetElement->hasTagName(pathTag)
         || targetElement->hasTagName(rectTag)

diff --git a/Source/WebCore/svg/SVGDocument.cpp b/Source/WebCore/svg/SVGDocument.cpp
index d27277a..1413df4 100644 (file)
--- a/Source/WebCore/svg/SVGDocument.cpp
+++ b/Source/WebCore/svg/SVGDocument.cpp
@@ -42,7 +42,7 @@ SVGDocument::SVGDocument(Frame* frame, const URL& url)
 SVGSVGElement* SVGDocument::rootElement() const
 {
     Element* element = documentElement();
-    if (element && isSVGSVGElement(element))
+    if (element && is<SVGSVGElement>(element))
         return downcast<SVGSVGElement>(element);
 
     return nullptr;

diff --git a/Source/WebCore/svg/SVGElement.cpp b/Source/WebCore/svg/SVGElement.cpp
index 25c1160..70655ad 100644 (file)
--- a/Source/WebCore/svg/SVGElement.cpp
+++ b/Source/WebCore/svg/SVGElement.cpp
@@ -320,7 +320,7 @@ SVGElementRareData& SVGElement::ensureSVGRareData()
 
 bool SVGElement::isOutermostSVGSVGElement() const
 {
-    if (!isSVGSVGElement(this))
+    if (!is<SVGSVGElement>(this))
         return false;
 
     // If we're living in a shadow tree, we're a <svg> element that got created as replacement
@@ -396,7 +396,7 @@ SVGSVGElement* SVGElement::ownerSVGElement() const
 {
     ContainerNode* node = parentOrShadowHostNode();
     while (node) {
-        if (isSVGSVGElement(node))
+        if (is<SVGSVGElement>(node))
             return downcast<SVGSVGElement>(node);
 
         node = node->parentOrShadowHostNode();
@@ -411,7 +411,7 @@ SVGElement* SVGElement::viewportElement() const
     // to determine the "overflow" property. <use> on <symbol> wouldn't work otherwhise.
     ContainerNode* node = parentOrShadowHostNode();
     while (node) {
-        if (isSVGSVGElement(node) || isSVGImageElement(node) || node->hasTagName(SVGNames::symbolTag))
+        if (is<SVGSVGElement>(node) || is<SVGImageElement>(node) || node->hasTagName(SVGNames::symbolTag))
             return downcast<SVGElement>(node);
 
         node = node->parentOrShadowHostNode();

diff --git a/Source/WebCore/svg/SVGFEComponentTransferElement.cpp b/Source/WebCore/svg/SVGFEComponentTransferElement.cpp
index 14d6fb0..46ae45d 100644 (file)
--- a/Source/WebCore/svg/SVGFEComponentTransferElement.cpp
+++ b/Source/WebCore/svg/SVGFEComponentTransferElement.cpp
@@ -90,13 +90,13 @@ PassRefPtr<FilterEffect> SVGFEComponentTransferElement::build(SVGFilterBuilder*
     ComponentTransferFunction alpha;
 
     for (auto& child : childrenOfType<SVGElement>(*this)) {
-        if (isSVGFEFuncRElement(child))
+        if (is<SVGFEFuncRElement>(child))
             red = downcast<SVGFEFuncRElement>(child).transferFunction();
-        else if (isSVGFEFuncGElement(child))
+        else if (is<SVGFEFuncGElement>(child))
             green = downcast<SVGFEFuncGElement>(child).transferFunction();
-        else if (isSVGFEFuncBElement(child))
+        else if (is<SVGFEFuncBElement>(child))
             blue = downcast<SVGFEFuncBElement>(child).transferFunction();
-        else if (isSVGFEFuncAElement(child))
+        else if (is<SVGFEFuncAElement>(child))
             alpha = downcast<SVGFEFuncAElement>(child).transferFunction();
     }
     

diff --git a/Source/WebCore/svg/SVGFELightElement.cpp b/Source/WebCore/svg/SVGFELightElement.cpp
index 6168d2d..7ff13a0 100644 (file)
--- a/Source/WebCore/svg/SVGFELightElement.cpp
+++ b/Source/WebCore/svg/SVGFELightElement.cpp
@@ -71,7 +71,7 @@ SVGFELightElement::SVGFELightElement(const QualifiedName& tagName, Document& doc
 SVGFELightElement* SVGFELightElement::findLightElement(const SVGElement* svgElement)
 {
     for (auto& child : childrenOfType<SVGElement>(*svgElement)) {
-        if (isSVGFEDistantLightElement(child) || isSVGFEPointLightElement(child) || isSVGFESpotLightElement(child))
+        if (is<SVGFEDistantLightElement>(child) || is<SVGFEPointLightElement>(child) || is<SVGFESpotLightElement>(child))
             return static_cast<SVGFELightElement*>(const_cast<SVGElement*>(&child));
     }
     return nullptr;

diff --git a/Source/WebCore/svg/SVGFontData.cpp b/Source/WebCore/svg/SVGFontData.cpp
index eb469ec..5093b2e 100644 (file)
--- a/Source/WebCore/svg/SVGFontData.cpp
+++ b/Source/WebCore/svg/SVGFontData.cpp
@@ -159,7 +159,7 @@ bool SVGFontData::applySVGGlyphSelection(WidthIterator& iterator, GlyphData& gly
         if (Element* parentRendererElement = parentRenderer->element()) {
             language = parentRendererElement->getAttribute(XMLNames::langAttr);
 
-            if (isSVGAltGlyphElement(parentRendererElement)) {
+            if (is<SVGAltGlyphElement>(parentRendererElement)) {
                 SVGAltGlyphElement& altGlyph = downcast<SVGAltGlyphElement>(*parentRendererElement);
                 if (!altGlyph.hasValidGlyphElements(altGlyphNames))
                     altGlyphNames.clear();

diff --git a/Source/WebCore/svg/SVGFontElement.cpp b/Source/WebCore/svg/SVGFontElement.cpp
index c6299e7..c33ffb7 100644 (file)
--- a/Source/WebCore/svg/SVGFontElement.cpp
+++ b/Source/WebCore/svg/SVGFontElement.cpp
@@ -119,7 +119,7 @@ void SVGFontElement::ensureGlyphCache()
     const SVGMissingGlyphElement* firstMissingGlyphElement = nullptr;
     Vector<String> ligatures;
     for (auto& child : childrenOfType<SVGElement>(*this)) {
-        if (isSVGGlyphElement(child)) {
+        if (is<SVGGlyphElement>(child)) {
             SVGGlyphElement& glyph = downcast<SVGGlyphElement>(child);
             AtomicString unicode = glyph.fastGetAttribute(SVGNames::unicodeAttr);
             AtomicString glyphId = glyph.getIdAttribute();
@@ -131,17 +131,17 @@ void SVGFontElement::ensureGlyphCache()
             // Register ligatures, if needed, don't mix up with surrogate pairs though!
             if (unicode.length() > 1 && !U16_IS_SURROGATE(unicode[0]))
                 ligatures.append(unicode.string());
-        } else if (isSVGHKernElement(child)) {
+        } else if (is<SVGHKernElement>(child)) {
             SVGHKernElement& hkern = downcast<SVGHKernElement>(child);
             SVGKerningPair kerningPair;
             if (hkern.buildHorizontalKerningPair(kerningPair))
                 m_horizontalKerningMap.insert(kerningPair);
-        } else if (isSVGVKernElement(child)) {
+        } else if (is<SVGVKernElement>(child)) {
             SVGVKernElement& vkern = downcast<SVGVKernElement>(child);
             SVGKerningPair kerningPair;
             if (vkern.buildVerticalKerningPair(kerningPair))
                 m_verticalKerningMap.insert(kerningPair);
-        } else if (isSVGMissingGlyphElement(child) && !firstMissingGlyphElement)
+        } else if (is<SVGMissingGlyphElement>(child) && !firstMissingGlyphElement)
             firstMissingGlyphElement = &downcast<SVGMissingGlyphElement>(child);
     }
 

diff --git a/Source/WebCore/svg/SVGFontFaceElement.cpp b/Source/WebCore/svg/SVGFontFaceElement.cpp
index 58403ce..2dfc76e 100644 (file)
--- a/Source/WebCore/svg/SVGFontFaceElement.cpp
+++ b/Source/WebCore/svg/SVGFontFaceElement.cpp
@@ -216,7 +216,7 @@ String SVGFontFaceElement::fontFamily() const
 SVGFontElement* SVGFontFaceElement::associatedFontElement() const
 {
     ASSERT(parentNode() == m_fontElement);
-    ASSERT(!parentNode() || isSVGFontElement(parentNode()));
+    ASSERT(!parentNode() || is<SVGFontElement>(parentNode()));
     return m_fontElement;
 }
 
@@ -230,7 +230,7 @@ void SVGFontFaceElement::rebuildFontFace()
     // we currently ignore all but the first src element, alternatively we could concat them
     auto srcElement = childrenOfType<SVGFontFaceSrcElement>(*this).first();
 
-    bool describesParentFont = isSVGFontElement(parentNode());
+    bool describesParentFont = is<SVGFontElement>(parentNode());
     RefPtr<CSSValueList> list;
 
     if (describesParentFont) {

diff --git a/Source/WebCore/svg/SVGFontFaceSrcElement.cpp b/Source/WebCore/svg/SVGFontFaceSrcElement.cpp
index 0e69ae6..2f806bb 100644 (file)
--- a/Source/WebCore/svg/SVGFontFaceSrcElement.cpp
+++ b/Source/WebCore/svg/SVGFontFaceSrcElement.cpp
@@ -50,9 +50,9 @@ PassRefPtr<CSSValueList> SVGFontFaceSrcElement::srcValue() const
     RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
     for (auto& child : childrenOfType<SVGElement>(*this)) {
         RefPtr<CSSFontFaceSrcValue> srcValue;
-        if (isSVGFontFaceUriElement(child))
+        if (is<SVGFontFaceUriElement>(child))
             srcValue = downcast<SVGFontFaceUriElement>(child).srcValue();
-        else if (isSVGFontFaceNameElement(child))
+        else if (is<SVGFontFaceNameElement>(child))
             srcValue = downcast<SVGFontFaceNameElement>(child).srcValue();
         if (srcValue && srcValue->resource().length())
             list->append(srcValue.releaseNonNull());
@@ -63,7 +63,7 @@ PassRefPtr<CSSValueList> SVGFontFaceSrcElement::srcValue() const
 void SVGFontFaceSrcElement::childrenChanged(const ChildChange& change)
 {
     SVGElement::childrenChanged(change);
-    if (parentNode() && isSVGFontFaceElement(parentNode()))
+    if (parentNode() && is<SVGFontFaceElement>(parentNode()))
         downcast<SVGFontFaceElement>(*parentNode()).rebuildFontFace();
 }
 

diff --git a/Source/WebCore/svg/SVGGlyphElement.cpp b/Source/WebCore/svg/SVGGlyphElement.cpp
index 63dc1fa..d91a47b 100644 (file)
--- a/Source/WebCore/svg/SVGGlyphElement.cpp
+++ b/Source/WebCore/svg/SVGGlyphElement.cpp
@@ -47,7 +47,7 @@ PassRefPtr<SVGGlyphElement> SVGGlyphElement::create(const QualifiedName& tagName
 void SVGGlyphElement::invalidateGlyphCache()
 {
     ContainerNode* fontNode = parentNode();
-    if (fontNode && isSVGFontElement(fontNode))
+    if (fontNode && is<SVGFontElement>(fontNode))
         downcast<SVGFontElement>(*fontNode).invalidateGlyphCache();
 }
 

diff --git a/Source/WebCore/svg/SVGHKernElement.cpp b/Source/WebCore/svg/SVGHKernElement.cpp
index 5894714..472a633 100644 (file)
--- a/Source/WebCore/svg/SVGHKernElement.cpp
+++ b/Source/WebCore/svg/SVGHKernElement.cpp
@@ -44,7 +44,7 @@ PassRefPtr<SVGHKernElement> SVGHKernElement::create(const QualifiedName& tagName
 Node::InsertionNotificationRequest SVGHKernElement::insertedInto(ContainerNode& rootParent)
 {
     ContainerNode* fontNode = parentNode();
-    if (fontNode && isSVGFontElement(fontNode))
+    if (fontNode && is<SVGFontElement>(fontNode))
         downcast<SVGFontElement>(*fontNode).invalidateGlyphCache();
 
     return SVGElement::insertedInto(rootParent);
@@ -53,7 +53,7 @@ Node::InsertionNotificationRequest SVGHKernElement::insertedInto(ContainerNode&
 void SVGHKernElement::removedFrom(ContainerNode& rootParent)
 {
     ContainerNode* fontNode = parentNode();
-    if (fontNode && isSVGFontElement(fontNode))
+    if (fontNode && is<SVGFontElement>(fontNode))
         downcast<SVGFontElement>(*fontNode).invalidateGlyphCache();
 
     SVGElement::removedFrom(rootParent);

diff --git a/Source/WebCore/svg/SVGLengthContext.cpp b/Source/WebCore/svg/SVGLengthContext.cpp
index 3783335..c05a73e 100644 (file)
--- a/Source/WebCore/svg/SVGLengthContext.cpp
+++ b/Source/WebCore/svg/SVGLengthContext.cpp
@@ -318,7 +318,7 @@ bool SVGLengthContext::determineViewport(FloatSize& viewportSize) const
 
     // Take size from nearest viewport element.
     SVGElement* viewportElement = m_context->viewportElement();
-    if (!viewportElement || !isSVGSVGElement(viewportElement))
+    if (!viewportElement || !is<SVGSVGElement>(viewportElement))
         return false;
 
     const SVGSVGElement& svg = downcast<SVGSVGElement>(*viewportElement);

diff --git a/Source/WebCore/svg/SVGLocatable.cpp b/Source/WebCore/svg/SVGLocatable.cpp
index 9f58702..af17111 100644 (file)
--- a/Source/WebCore/svg/SVGLocatable.cpp
+++ b/Source/WebCore/svg/SVGLocatable.cpp
@@ -36,7 +36,7 @@ static bool isViewportElement(Node* node)
     return (node->hasTagName(SVGNames::svgTag)
         || node->hasTagName(SVGNames::symbolTag)
         || node->hasTagName(SVGNames::foreignObjectTag)
-        || isSVGImageElement(node));
+        || is<SVGImageElement>(node));
 }
 
 SVGElement* SVGLocatable::nearestViewportElement(const SVGElement* element)

diff --git a/Source/WebCore/svg/SVGMPathElement.cpp b/Source/WebCore/svg/SVGMPathElement.cpp
index 2c3ce7a..b5f8a72 100644 (file)
--- a/Source/WebCore/svg/SVGMPathElement.cpp
+++ b/Source/WebCore/svg/SVGMPathElement.cpp
@@ -156,7 +156,7 @@ void SVGMPathElement::svgAttributeChanged(const QualifiedName& attrName)
 SVGPathElement* SVGMPathElement::pathElement()
 {
     Element* target = targetElementFromIRIString(href(), document());
-    if (target && isSVGPathElement(target))
+    if (target && is<SVGPathElement>(target))
         return downcast<SVGPathElement>(target);
     return nullptr;
 }
@@ -168,7 +168,7 @@ void SVGMPathElement::targetPathChanged()
 
 void SVGMPathElement::notifyParentOfPathChange(ContainerNode* parent)
 {
-    if (parent && isSVGAnimateMotionElement(parent))
+    if (parent && is<SVGAnimateMotionElement>(parent))
         downcast<SVGAnimateMotionElement>(*parent).updateAnimationPath();
 }
 

diff --git a/Source/WebCore/svg/SVGPathElement.cpp b/Source/WebCore/svg/SVGPathElement.cpp
index f323998..12c4a38 100644 (file)
--- a/Source/WebCore/svg/SVGPathElement.cpp
+++ b/Source/WebCore/svg/SVGPathElement.cpp
@@ -286,7 +286,7 @@ void SVGPathElement::invalidateMPathDependencies()
     // markForLayoutAndParentResourceInvalidation so we update any mpath dependencies manually.
     if (HashSet<SVGElement*>* dependencies = document().accessSVGExtensions().setOfElementsReferencingTarget(this)) {
         for (auto* element : *dependencies) {
-            if (isSVGMPathElement(element))
+            if (is<SVGMPathElement>(element))
                 downcast<SVGMPathElement>(*element).targetPathChanged();
         }
     }

diff --git a/Source/WebCore/svg/SVGPatternElement.cpp b/Source/WebCore/svg/SVGPatternElement.cpp
index 9bcdb86..9bd4e85 100644 (file)
--- a/Source/WebCore/svg/SVGPatternElement.cpp
+++ b/Source/WebCore/svg/SVGPatternElement.cpp
@@ -236,7 +236,7 @@ void SVGPatternElement::collectPatternAttributes(PatternAttributes& attributes)
 
         // Respect xlink:href, take attributes from referenced element
         Element* refElement = SVGURIReference::targetElementFromIRIString(current->href(), document());
-        if (refElement && isSVGPatternElement(refElement)) {
+        if (refElement && is<SVGPatternElement>(refElement)) {
             current = downcast<SVGPatternElement>(refElement);
 
             // Cycle detection

diff --git a/Source/WebCore/svg/SVGSVGElement.cpp b/Source/WebCore/svg/SVGSVGElement.cpp
index 7d08d18..c14cc3b 100644 (file)
--- a/Source/WebCore/svg/SVGSVGElement.cpp
+++ b/Source/WebCore/svg/SVGSVGElement.cpp
@@ -661,10 +661,10 @@ void SVGSVGElement::setupInitialView(const String& fragmentIdentifier, Element*
     // or MyDrawing.svg#xpointer(id('MyView'))) then the closest ancestor ‘svg’ element is displayed in the viewport.
     // Any view specification attributes included on the given ‘view’ element override the corresponding view specification
     // attributes on the closest ancestor ‘svg’ element.
-    if (anchorNode && isSVGViewElement(anchorNode)) {
+    if (anchorNode && is<SVGViewElement>(anchorNode)) {
         SVGViewElement& viewElement = downcast<SVGViewElement>(*anchorNode);
         SVGElement* element = SVGLocatable::nearestViewportElement(&viewElement);
-        if (isSVGSVGElement(element)) {
+        if (is<SVGSVGElement>(element)) {
             SVGSVGElement& svg = downcast<SVGSVGElement>(*element);
             svg.inheritViewAttributes(&viewElement);
 

diff --git a/Source/WebCore/svg/SVGUseElement.cpp b/Source/WebCore/svg/SVGUseElement.cpp
index de0ac8d..a394405 100644 (file)
--- a/Source/WebCore/svg/SVGUseElement.cpp
+++ b/Source/WebCore/svg/SVGUseElement.cpp
@@ -282,7 +282,7 @@ static void dumpInstanceTree(unsigned int& depth, String& text, SVGElementInstan
     SVGElement* element = targetInstance->correspondingElement();
     ASSERT(element);
 
-    if (isSVGUseElement(element)) {
+    if (is<SVGUseElement>(element)) {
         if (downcast<SVGUseElement>(*element).cachedDocumentIsStillLoading())
             return;
     }
@@ -710,7 +710,7 @@ void SVGUseElement::expandUseElementsInShadowTree(Node* element)
     // contains <use> tags, we'd miss them. So once we're done with settin' up the
     // actual shadow tree (after the special case modification for svg/symbol) we have
     // to walk it completely and expand all <use> elements.
-    if (isSVGUseElement(element)) {
+    if (is<SVGUseElement>(element)) {
         SVGUseElement& use = downcast<SVGUseElement>(*element);
         ASSERT(!use.cachedDocumentIsStillLoading());
 

diff --git a/Source/WebCore/svg/SVGVKernElement.cpp b/Source/WebCore/svg/SVGVKernElement.cpp
index e3b4a01..819ab1e 100644 (file)
--- a/Source/WebCore/svg/SVGVKernElement.cpp
+++ b/Source/WebCore/svg/SVGVKernElement.cpp
@@ -44,7 +44,7 @@ Node::InsertionNotificationRequest SVGVKernElement::insertedInto(ContainerNode&
 {
     if (rootParent.inDocument()) {
         ContainerNode* fontNode = parentNode();
-        if (fontNode && isSVGFontElement(fontNode))
+        if (fontNode && is<SVGFontElement>(fontNode))
             downcast<SVGFontElement>(*fontNode).invalidateGlyphCache();
     }
 
@@ -54,7 +54,7 @@ Node::InsertionNotificationRequest SVGVKernElement::insertedInto(ContainerNode&
 void SVGVKernElement::removedFrom(ContainerNode& rootParent)
 {
     ContainerNode* fontNode = parentNode();
-    if (fontNode && isSVGFontElement(fontNode))
+    if (fontNode && is<SVGFontElement>(fontNode))
         downcast<SVGFontElement>(*fontNode).invalidateGlyphCache();
 
     SVGElement::removedFrom(rootParent);