From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebCore/svg/SVGAltGlyphDefElement.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Source/WebCore/svg/SVGAltGlyphDefElement.cpp') diff --git a/Source/WebCore/svg/SVGAltGlyphDefElement.cpp b/Source/WebCore/svg/SVGAltGlyphDefElement.cpp index 099c40f67..91f8879f3 100644 --- a/Source/WebCore/svg/SVGAltGlyphDefElement.cpp +++ b/Source/WebCore/svg/SVGAltGlyphDefElement.cpp @@ -19,7 +19,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FONTS) +#if ENABLE(SVG_FONTS) #include "SVGAltGlyphDefElement.h" #include "ElementIterator.h" @@ -35,9 +35,9 @@ inline SVGAltGlyphDefElement::SVGAltGlyphDefElement(const QualifiedName& tagName ASSERT(hasTagName(SVGNames::altGlyphDefTag)); } -PassRefPtr SVGAltGlyphDefElement::create(const QualifiedName& tagName, Document& document) +Ref SVGAltGlyphDefElement::create(const QualifiedName& tagName, Document& document) { - return adoptRef(new SVGAltGlyphDefElement(tagName, document)); + return adoptRef(*new SVGAltGlyphDefElement(tagName, document)); } bool SVGAltGlyphDefElement::hasValidGlyphElements(Vector& glyphNames) const @@ -90,11 +90,11 @@ bool SVGAltGlyphDefElement::hasValidGlyphElements(Vector& glyphNames) co bool foundFirstAltGlyphItem = false; for (auto& child : childrenOfType(*this)) { - if (!foundFirstAltGlyphItem && isSVGGlyphRefElement(child)) { + if (!foundFirstAltGlyphItem && is(child)) { fountFirstGlyphRef = true; String referredGlyphName; - if (toSVGGlyphRefElement(child).hasValidGlyphElement(referredGlyphName)) + if (downcast(child).hasValidGlyphElement(referredGlyphName)) glyphNames.append(referredGlyphName); else { // As the spec says "If any of the referenced glyphs are unavailable, @@ -104,12 +104,12 @@ bool SVGAltGlyphDefElement::hasValidGlyphElements(Vector& glyphNames) co glyphNames.clear(); return false; } - } else if (!fountFirstGlyphRef && isSVGAltGlyphItemElement(child)) { + } else if (!fountFirstGlyphRef && is(child)) { foundFirstAltGlyphItem = true; // As the spec says "The first 'altGlyphItem' in which all referenced glyphs // are available is chosen." - if (toSVGAltGlyphItemElement(child).hasValidGlyphElements(glyphNames) && !glyphNames.isEmpty()) + if (downcast(child).hasValidGlyphElements(glyphNames) && !glyphNames.isEmpty()) return true; } } -- cgit v1.2.1