Changeset 157924 in webkit

Timestamp:

Oct 24, 2013, 6:26:06 AM (12 years ago)

Author:

Antti Koivisto

Message:

Element iterator functions should take reference
​https://bugs.webkit.org/show_bug.cgi?id=123267

Reviewed by Andreas Kling.

The argument has to be non-null.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AccessibilityNodeObject.cpp (modified) (4 diffs)
• accessibility/AccessibilityRenderObject.cpp (modified) (1 diff)
• accessibility/AccessibilityTable.cpp (modified) (1 diff)
• accessibility/mac/AccessibilityObjectMac.mm (modified) (1 diff)
• css/CSSFontFaceSource.cpp (modified) (1 diff)
• css/StyleInvalidationAnalysis.cpp (modified) (1 diff)
• css/StyleInvalidationAnalysis.h (modified) (1 diff)
• dom/Document.cpp (modified) (7 diffs)
• dom/DocumentStyleSheetCollection.cpp (modified) (1 diff)
• dom/ElementAncestorIterator.h (modified) (4 diffs)
• dom/ElementChildIterator.h (modified) (17 diffs)
• dom/ElementDescendantIterator.h (modified) (17 diffs)
• dom/SelectorQuery.cpp (modified) (6 diffs)
• dom/TreeScope.cpp (modified) (2 diffs)
• editing/ApplyStyleCommand.cpp (modified) (1 diff)
• editing/ReplaceSelectionCommand.cpp (modified) (1 diff)
• editing/markup.cpp (modified) (1 diff)
• html/HTMLAppletElement.cpp (modified) (1 diff)
• html/HTMLElement.cpp (modified) (2 diffs)
• html/HTMLFieldSetElement.cpp (modified) (4 diffs)
• html/HTMLFrameSetElement.cpp (modified) (1 diff)
• html/HTMLLabelElement.cpp (modified) (1 diff)
• html/HTMLLegendElement.cpp (modified) (2 diffs)
• html/HTMLMapElement.cpp (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (4 diffs)
• html/HTMLObjectElement.cpp (modified) (2 diffs)
• loader/PlaceholderDocument.cpp (modified) (1 diff)
• rendering/FilterEffectRenderer.cpp (modified) (1 diff)
• rendering/svg/RenderSVGResourceClipper.cpp (modified) (1 diff)
• rendering/svg/RenderSVGResourceFilter.cpp (modified) (1 diff)
• rendering/svg/RenderSVGResourceMasker.cpp (modified) (1 diff)
• rendering/svg/RenderSVGResourcePattern.cpp (modified) (1 diff)
• svg/SVGAltGlyphDefElement.cpp (modified) (1 diff)
• svg/SVGAltGlyphItemElement.cpp (modified) (1 diff)
• svg/SVGAnimateMotionElement.cpp (modified) (1 diff)
• svg/SVGElement.cpp (modified) (2 diffs)
• svg/SVGFEComponentTransferElement.cpp (modified) (1 diff)
• svg/SVGFELightElement.cpp (modified) (1 diff)
• svg/SVGFEMergeElement.cpp (modified) (1 diff)
• svg/SVGFontElement.cpp (modified) (2 diffs)
• svg/SVGFontFaceElement.cpp (modified) (1 diff)
• svg/SVGFontFaceSrcElement.cpp (modified) (1 diff)
• svg/SVGGradientElement.cpp (modified) (1 diff)
• svg/SVGSVGElement.cpp (modified) (2 diffs)
• svg/SVGSwitchElement.cpp (modified) (1 diff)
• svg/SVGUseElement.cpp (modified) (3 diffs)
• svg/animation/SMILTimeContainer.cpp (modified) (1 diff)
• svg/graphics/SVGImage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-24  Antti Koivisto  <antti@apple.com>
+
+        Element iterator functions should take reference
+        https://bugs.webkit.org/show_bug.cgi?id=123267
+
+        Reviewed by Andreas Kling.
+
+        The argument has to be non-null.
+
 2013-10-24  Ryuan Choi  <ryuan.choi@samsung.com>
 

trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp

@@ -399 +399 @@
     case LegendRole:
         if (Element* element = this->element())
-            return !ancestorsOfType<HTMLFieldSetElement>(element).first();
+            return !ancestorsOfType<HTMLFieldSetElement>(*element).first();
     default:
         return true;
@@ -425 +425 @@
     if (!node || !node->hasTagName(canvasTag))
         return false;
-    Element* canvasElement = toElement(node);
+    Element& canvasElement = toElement(*node);
     // If it has any children that are elements, we'll assume it might be fallback
     // content. If it has no children or its only children are not elements
@@ -1142 +1142 @@
     }
 
-    return ancestorsOfType<HTMLLabelElement>(element).first();
+    return ancestorsOfType<HTMLLabelElement>(*element).first();
 }
 
@@ -1163 +1163 @@
     if (!parent)
         return 0;
-    for (auto sibling = elementChildren(parent).begin(), end = elementChildren(parent).end(); sibling != end; ++sibling) {
+    auto children = elementChildren(*parent);
+    for (auto sibling = children.begin(), end = children.end(); sibling != end; ++sibling) {
         const AtomicString& siblingAriaRole = sibling->fastGetAttribute(roleAttr);
         if (equalIgnoringCase(siblingAriaRole, role))

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -2709 +2709 @@
         return;
 
-    for (auto area = descendantsOfType<HTMLAreaElement>(map).begin(), end = descendantsOfType<HTMLAreaElement>(map).end() ; area != end; ++area) {
+    auto areaDescendants = descendantsOfType<HTMLAreaElement>(*map);
+    for (auto area = areaDescendants.begin(), end = areaDescendants.end() ; area != end; ++area) {
         // add an <area> element for this child if it has a link
         if (!area->isLink())

trunk/Source/WebCore/accessibility/AccessibilityTable.cpp

@@ -125 +125 @@
 
     // if there's a colgroup or col element, it's probably a data table.
-    for (auto child = elementChildren(tableElement).begin(), end = elementChildren(tableElement).end(); child != end; ++child) {
+    auto tableChildren = elementChildren(*tableElement);
+    for (auto child = tableChildren.begin(), end = tableChildren.end(); child != end; ++child) {
         if (child->hasTagName(colTag) || child->hasTagName(colgroupTag))
             return true;

trunk/Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm

@@ -87 +87 @@
         if (renderer->isLegend()) {
             Element* element = this->element();
-            if (element && ancestorsOfType<HTMLFieldSetElement>(element).first())
+            if (element && ancestorsOfType<HTMLFieldSetElement>(*element).first())
                 return IgnoreObject;
         }

trunk/Source/WebCore/css/CSSFontFaceSource.cpp

@@ -140 +140 @@
                     return 0;
 
-                if (auto firstFontFace = childrenOfType<SVGFontFaceElement>(m_externalSVGFontElement.get()).first()) {
+                if (auto firstFontFace = childrenOfType<SVGFontFaceElement>(*m_externalSVGFontElement).first()) {
                     if (!m_svgFontFaceElement) {
                         // We're created using a CSS @font-face rule, that means we're not associated with a SVGFontFaceElement.

trunk/Source/WebCore/css/StyleInvalidationAnalysis.cpp

@@ -113 +113 @@
 }
 
-void StyleInvalidationAnalysis::invalidateStyle(Document* document)
+void StyleInvalidationAnalysis::invalidateStyle(Document& document)
 {
     ASSERT(!m_dirtiesAllStyle);

trunk/Source/WebCore/css/StyleInvalidationAnalysis.h

@@ -41 +41 @@
 
     bool dirtiesAllStyle() const { return m_dirtiesAllStyle; }
-    void invalidateStyle(Document*);
+    void invalidateStyle(Document&);
 
 private:

trunk/Source/WebCore/dom/Document.cpp

@@ -672 +672 @@
     ASSERT(scope);
     ContainerNode* rootNode = scope->rootNode();
-    for (auto element = elementDescendants(rootNode).begin(), end = elementDescendants(rootNode).end(); element != end; ++element) {
+    auto descendant = elementDescendants(*rootNode);
+    for (auto element = descendant.begin(), end = descendant.end(); element != end; ++element) {
         const AtomicString& accessKey = element->fastGetAttribute(accesskeyAttr);
         if (!accessKey.isEmpty())
@@ -792 +793 @@
 #endif
 
-    Element* newDocumentElement = elementChildren(this).first();
+    Element* newDocumentElement = elementChildren(*this).first();
 
     if (newDocumentElement == m_documentElement)
@@ -1520 +1521 @@
     // Update title based on first title element in the head, if one exists.
     if (HTMLElement* headElement = head()) {
-        if (auto firstTitle = childrenOfType<HTMLTitleElement>(headElement).first())
+        if (auto firstTitle = childrenOfType<HTMLTitleElement>(*headElement).first())
             setTitleElement(firstTitle->textWithDirection(), firstTitle);
     }
@@ -2255 +2256 @@
     if (!element)
         return nullptr;
-    if (auto frameset = childrenOfType<HTMLFrameSetElement>(element).first())
+    if (auto frameset = childrenOfType<HTMLFrameSetElement>(*element).first())
         return frameset;
-    return childrenOfType<HTMLBodyElement>(element).first();
+    return childrenOfType<HTMLBodyElement>(*element).first();
 }
 
@@ -2288 +2289 @@
 {
     if (auto element = documentElement())
-        return childrenOfType<HTMLHeadElement>(element).first();
+        return childrenOfType<HTMLHeadElement>(*element).first();
     return nullptr;
 }
@@ -2604 +2605 @@
         // Base URL change changes any relative visited links.
         // FIXME: There are other URLs in the tree that would need to be re-evaluated on dynamic base URL change. Style should be invalidated too.
-        auto anchorDescendants = descendantsOfType<HTMLAnchorElement>(this);
+        auto anchorDescendants = descendantsOfType<HTMLAnchorElement>(*this);
         for (auto anchor = anchorDescendants.begin(), end = anchorDescendants.end(); anchor != end; ++anchor)
             anchor->invalidateCachedVisitedLinkHash();
@@ -2621 +2622 @@
     const AtomicString* href = nullptr;
     const AtomicString* target = nullptr;
-    auto baseDescendants = descendantsOfType<HTMLBaseElement>(this);
+    auto baseDescendants = descendantsOfType<HTMLBaseElement>(*this);
     for (auto base = baseDescendants.begin(), end = baseDescendants.end(); base != end && (!href || !target); ++base) {
         if (!href) {

trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp

@@ -404 +404 @@
     if (invalidationAnalysis.dirtiesAllStyle())
         return;
-    invalidationAnalysis.invalidateStyle(&m_document);
+    invalidationAnalysis.invalidateStyle(m_document);
     requiresFullStyleRecalc = false;
 }

trunk/Source/WebCore/dom/ElementAncestorIterator.h

@@ -50 +50 @@
 class ElementAncestorIteratorAdapter {
 public:
-    explicit ElementAncestorIteratorAdapter(ElementType* descendant);
+    explicit ElementAncestorIteratorAdapter(ElementType* first);
     ElementAncestorIterator<ElementType> begin();
     ElementAncestorIterator<ElementType> end();
@@ -62 +62 @@
 class ElementAncestorConstIteratorAdapter {
 public:
-    explicit ElementAncestorConstIteratorAdapter(const ElementType* descendant);
+    explicit ElementAncestorConstIteratorAdapter(const ElementType* first);
     ElementAncestorConstIterator<ElementType> begin() const;
     ElementAncestorConstIterator<ElementType> end() const;
@@ -75 +75 @@
 ElementAncestorIteratorAdapter<Element> elementAncestors(Element* descendant);
 ElementAncestorConstIteratorAdapter<Element> elementAncestors(const Element* descendant);
-template <typename ElementType> ElementAncestorIteratorAdapter<ElementType> lineageOfType(Element* first);
-template <typename ElementType> ElementAncestorConstIteratorAdapter<ElementType> lineageOfType(const Element* first);
-template <typename ElementType> ElementAncestorIteratorAdapter<ElementType> ancestorsOfType(Element* descendant);
-template <typename ElementType> ElementAncestorConstIteratorAdapter<ElementType> ancestorsOfType(const Element* descendant);
+template <typename ElementType> ElementAncestorIteratorAdapter<ElementType> lineageOfType(Element& first);
+template <typename ElementType> ElementAncestorConstIteratorAdapter<ElementType> lineageOfType(const Element& first);
+template <typename ElementType> ElementAncestorIteratorAdapter<ElementType> ancestorsOfType(Element& descendant);
+template <typename ElementType> ElementAncestorConstIteratorAdapter<ElementType> ancestorsOfType(const Element& descendant);
 
 // ElementAncestorIterator
@@ -183 +183 @@
 
 template <typename ElementType>
-inline ElementAncestorIteratorAdapter<ElementType> lineageOfType(ElementType* first)
-{
+inline ElementAncestorIteratorAdapter<ElementType> lineageOfType(ElementType& first)
+{
+    return ElementAncestorIteratorAdapter<ElementType>(&first);
+}
+
+template <typename ElementType>
+inline ElementAncestorConstIteratorAdapter<ElementType> lineageOfType(const ElementType& first)
+{
+    return ElementAncestorConstIteratorAdapter<ElementType>(&first);
+}
+
+template <typename ElementType>
+inline ElementAncestorIteratorAdapter<ElementType> ancestorsOfType(Element& descendant)
+{
+    ElementType* first = findElementAncestorOfType<ElementType>(descendant);
     return ElementAncestorIteratorAdapter<ElementType>(first);
 }
 
 template <typename ElementType>
-inline ElementAncestorConstIteratorAdapter<ElementType> lineageOfType(const ElementType* first)
-{
+inline ElementAncestorConstIteratorAdapter<ElementType> ancestorsOfType(const Element& descendant)
+{
+    const ElementType* first = findElementAncestorOfType<const ElementType>(descendant);
     return ElementAncestorConstIteratorAdapter<ElementType>(first);
 }
 
-template <typename ElementType>
-inline ElementAncestorIteratorAdapter<ElementType> ancestorsOfType(Element* descendant)
-{
-    ElementType* first = findElementAncestorOfType<ElementType>(*descendant);
-    return ElementAncestorIteratorAdapter<ElementType>(first);
-}
-
-template <typename ElementType>
-inline ElementAncestorConstIteratorAdapter<ElementType> ancestorsOfType(const Element* descendant)
-{
-    const ElementType* first = findElementAncestorOfType<const ElementType>(*descendant);
-    return ElementAncestorConstIteratorAdapter<ElementType>(first);
-}
-
 }
 

trunk/Source/WebCore/dom/ElementChildIterator.h

@@ -34 +34 @@
 class ElementChildIterator : public ElementIterator<ElementType> {
 public:
-    ElementChildIterator(const ContainerNode* root);
-    ElementChildIterator(const ContainerNode* root, ElementType* current);
+    ElementChildIterator(const ContainerNode& parent);
+    ElementChildIterator(const ContainerNode& parent, ElementType* current);
     ElementChildIterator& operator++();
 };
@@ -42 +42 @@
 class ElementChildConstIterator : public ElementConstIterator<ElementType> {
 public:
-    ElementChildConstIterator(const ContainerNode* root);
-    ElementChildConstIterator(const ContainerNode* root, const ElementType* current);
+    ElementChildConstIterator(const ContainerNode& parent);
+    ElementChildConstIterator(const ContainerNode& parent, const ElementType* current);
     ElementChildConstIterator& operator++();
 };
@@ -50 +50 @@
 class ElementChildIteratorAdapter {
 public:
-    ElementChildIteratorAdapter(ContainerNode* root);
+    ElementChildIteratorAdapter(ContainerNode& parent);
     ElementChildIterator<ElementType> begin();
     ElementChildIterator<ElementType> end();
@@ -57 +57 @@
 
 private:
-    const ContainerNode* m_root;
+    ContainerNode& m_parent;
 };
 
@@ -63 +63 @@
 class ElementChildConstIteratorAdapter {
 public:
-    ElementChildConstIteratorAdapter(const ContainerNode* root);
+    ElementChildConstIteratorAdapter(const ContainerNode& parent);
     ElementChildConstIterator<ElementType> begin() const;
     ElementChildConstIterator<ElementType> end() const;
@@ -70 +70 @@
 
 private:
-    const ContainerNode* m_root;
-};
-
-ElementChildIteratorAdapter<Element> elementChildren(ContainerNode* root);
-ElementChildConstIteratorAdapter<Element> elementChildren(const ContainerNode* root);
-template <typename ElementType> ElementChildIteratorAdapter<ElementType> childrenOfType(ContainerNode* root);
-template <typename ElementType> ElementChildConstIteratorAdapter<ElementType> childrenOfType(const ContainerNode* root);
+    const ContainerNode& m_parent;
+};
+
+ElementChildIteratorAdapter<Element> elementChildren(ContainerNode&);
+ElementChildConstIteratorAdapter<Element> elementChildren(const ContainerNode&);
+template <typename ElementType> ElementChildIteratorAdapter<ElementType> childrenOfType(ContainerNode&);
+template <typename ElementType> ElementChildConstIteratorAdapter<ElementType> childrenOfType(const ContainerNode&);
 
 // ElementChildIterator
 
 template <typename ElementType>
-inline ElementChildIterator<ElementType>::ElementChildIterator(const ContainerNode* root)
-    : ElementIterator<ElementType>(root)
-{
-}
-
-template <typename ElementType>
-inline ElementChildIterator<ElementType>::ElementChildIterator(const ContainerNode* root, ElementType* current)
-    : ElementIterator<ElementType>(root, current)
+inline ElementChildIterator<ElementType>::ElementChildIterator(const ContainerNode& parent)
+    : ElementIterator<ElementType>(&parent)
+{
+}
+
+template <typename ElementType>
+inline ElementChildIterator<ElementType>::ElementChildIterator(const ContainerNode& parent, ElementType* current)
+    : ElementIterator<ElementType>(&parent, current)
 {
 }
@@ -101 +101 @@
 
 template <typename ElementType>
-inline ElementChildConstIterator<ElementType>::ElementChildConstIterator(const ContainerNode* root)
-    : ElementConstIterator<ElementType>(root)
-{
-}
-
-template <typename ElementType>
-inline ElementChildConstIterator<ElementType>::ElementChildConstIterator(const ContainerNode* root, const ElementType* current)
-    : ElementConstIterator<ElementType>(root, current)
+inline ElementChildConstIterator<ElementType>::ElementChildConstIterator(const ContainerNode& parent)
+    : ElementConstIterator<ElementType>(&parent)
+{
+}
+
+template <typename ElementType>
+inline ElementChildConstIterator<ElementType>::ElementChildConstIterator(const ContainerNode& parent, const ElementType* current)
+    : ElementConstIterator<ElementType>(&parent, current)
 {
 }
@@ -121 +121 @@
 
 template <typename ElementType>
-inline ElementChildIteratorAdapter<ElementType>::ElementChildIteratorAdapter(ContainerNode* root)
-    : m_root(root)
+inline ElementChildIteratorAdapter<ElementType>::ElementChildIteratorAdapter(ContainerNode& parent)
+    : m_parent(parent)
 {
 }
@@ -129 +129 @@
 inline ElementChildIterator<ElementType> ElementChildIteratorAdapter<ElementType>::begin()
 {
-    return ElementChildIterator<ElementType>(m_root, Traversal<ElementType>::firstChild(m_root));
+    return ElementChildIterator<ElementType>(m_parent, Traversal<ElementType>::firstChild(&m_parent));
 }
 
@@ -135 +135 @@
 inline ElementChildIterator<ElementType> ElementChildIteratorAdapter<ElementType>::end()
 {
-    return ElementChildIterator<ElementType>(m_root);
+    return ElementChildIterator<ElementType>(m_parent);
 }
 
@@ -141 +141 @@
 inline ElementType* ElementChildIteratorAdapter<ElementType>::first()
 {
-    return Traversal<ElementType>::firstChild(m_root);
+    return Traversal<ElementType>::firstChild(&m_parent);
 }
 
@@ -147 +147 @@
 inline ElementType* ElementChildIteratorAdapter<ElementType>::last()
 {
-    return Traversal<ElementType>::lastChild(m_root);
+    return Traversal<ElementType>::lastChild(&m_parent);
 }
 
@@ -153 +153 @@
 
 template <typename ElementType>
-inline ElementChildConstIteratorAdapter<ElementType>::ElementChildConstIteratorAdapter(const ContainerNode* root)
-    : m_root(root)
+inline ElementChildConstIteratorAdapter<ElementType>::ElementChildConstIteratorAdapter(const ContainerNode& parent)
+    : m_parent(parent)
 {
 }
@@ -161 +161 @@
 inline ElementChildConstIterator<ElementType> ElementChildConstIteratorAdapter<ElementType>::begin() const
 {
-    return ElementChildConstIterator<ElementType>(m_root, Traversal<ElementType>::firstChild(m_root));
+    return ElementChildConstIterator<ElementType>(m_parent, Traversal<ElementType>::firstChild(&m_parent));
 }
 
@@ -167 +167 @@
 inline ElementChildConstIterator<ElementType> ElementChildConstIteratorAdapter<ElementType>::end() const
 {
-    return ElementChildConstIterator<ElementType>(m_root);
+    return ElementChildConstIterator<ElementType>(m_parent);
 }
 
@@ -173 +173 @@
 inline const ElementType* ElementChildConstIteratorAdapter<ElementType>::first() const
 {
-    return Traversal<ElementType>::firstChild(m_root);
+    return Traversal<ElementType>::firstChild(&m_parent);
 }
 
@@ -179 +179 @@
 inline const ElementType* ElementChildConstIteratorAdapter<ElementType>::last() const
 {
-    return Traversal<ElementType>::lastChild(m_root);
+    return Traversal<ElementType>::lastChild(&m_parent);
 }
 
 // Standalone functions
 
-inline ElementChildIteratorAdapter<Element> elementChildren(ContainerNode* root)
-{
-    return ElementChildIteratorAdapter<Element>(root);
-}
-
-template <typename ElementType>
-inline ElementChildIteratorAdapter<ElementType> childrenOfType(ContainerNode* root)
-{
-    return ElementChildIteratorAdapter<ElementType>(root);
-}
-
-inline ElementChildConstIteratorAdapter<Element> elementChildren(const ContainerNode* root)
-{
-    return ElementChildConstIteratorAdapter<Element>(root);
-}
-
-template <typename ElementType>
-inline ElementChildConstIteratorAdapter<ElementType> childrenOfType(const ContainerNode* root)
-{
-    return ElementChildConstIteratorAdapter<ElementType>(root);
+inline ElementChildIteratorAdapter<Element> elementChildren(ContainerNode& parent)
+{
+    return ElementChildIteratorAdapter<Element>(parent);
+}
+
+template <typename ElementType>
+inline ElementChildIteratorAdapter<ElementType> childrenOfType(ContainerNode& parent)
+{
+    return ElementChildIteratorAdapter<ElementType>(parent);
+}
+
+inline ElementChildConstIteratorAdapter<Element> elementChildren(const ContainerNode& parent)
+{
+    return ElementChildConstIteratorAdapter<Element>(parent);
+}
+
+template <typename ElementType>
+inline ElementChildConstIteratorAdapter<ElementType> childrenOfType(const ContainerNode& parent)
+{
+    return ElementChildConstIteratorAdapter<ElementType>(parent);
 }
 

trunk/Source/WebCore/dom/ElementDescendantIterator.h

@@ -34 +34 @@
 class ElementDescendantIterator : public ElementIterator<ElementType> {
 public:
-    ElementDescendantIterator(const ContainerNode* root);
-    ElementDescendantIterator(const ContainerNode* root, ElementType* current);
+    ElementDescendantIterator(const ContainerNode& root);
+    ElementDescendantIterator(const ContainerNode& root, ElementType* current);
     ElementDescendantIterator& operator++();
 };
@@ -42 +42 @@
 class ElementDescendantConstIterator : public ElementConstIterator<ElementType>  {
 public:
-    ElementDescendantConstIterator(const ContainerNode* root);
-    ElementDescendantConstIterator(const ContainerNode* root, const ElementType* current);
+    ElementDescendantConstIterator(const ContainerNode& root);
+    ElementDescendantConstIterator(const ContainerNode& root, const ElementType* current);
     ElementDescendantConstIterator& operator++();
 };
@@ -50 +50 @@
 class ElementDescendantIteratorAdapter {
 public:
-    ElementDescendantIteratorAdapter(ContainerNode* root);
+    ElementDescendantIteratorAdapter(ContainerNode& root);
     ElementDescendantIterator<ElementType> begin();
     ElementDescendantIterator<ElementType> end();
@@ -57 +57 @@
 
 private:
-    ContainerNode* m_root;
+    ContainerNode& m_root;
 };
 
@@ -63 +63 @@
 class ElementDescendantConstIteratorAdapter {
 public:
-    ElementDescendantConstIteratorAdapter(const ContainerNode* root);
+    ElementDescendantConstIteratorAdapter(const ContainerNode& root);
     ElementDescendantConstIterator<ElementType> begin() const;
     ElementDescendantConstIterator<ElementType> end() const;
@@ -70 +70 @@
 
 private:
-    const ContainerNode* m_root;
-};
-
-ElementDescendantIteratorAdapter<Element> elementDescendants(ContainerNode* root);
-ElementDescendantConstIteratorAdapter<Element> elementDescendants(const ContainerNode* root);
-template <typename ElementType> ElementDescendantIteratorAdapter<ElementType> descendantsOfType(ContainerNode* root);
-template <typename ElementType> ElementDescendantConstIteratorAdapter<ElementType> descendantsOfType(const ContainerNode* root);
+    const ContainerNode& m_root;
+};
+
+ElementDescendantIteratorAdapter<Element> elementDescendants(ContainerNode&);
+ElementDescendantConstIteratorAdapter<Element> elementDescendants(const ContainerNode&);
+template <typename ElementType> ElementDescendantIteratorAdapter<ElementType> descendantsOfType(ContainerNode&);
+template <typename ElementType> ElementDescendantConstIteratorAdapter<ElementType> descendantsOfType(const ContainerNode&);
 
 // ElementDescendantIterator
 
 template <typename ElementType>
-inline ElementDescendantIterator<ElementType>::ElementDescendantIterator(const ContainerNode* root)
-    : ElementIterator<ElementType>(root)
-{
-}
-
-template <typename ElementType>
-inline ElementDescendantIterator<ElementType>::ElementDescendantIterator(const ContainerNode* root, ElementType* current)
-    : ElementIterator<ElementType>(root, current)
+inline ElementDescendantIterator<ElementType>::ElementDescendantIterator(const ContainerNode& root)
+    : ElementIterator<ElementType>(&root)
+{
+}
+
+template <typename ElementType>
+inline ElementDescendantIterator<ElementType>::ElementDescendantIterator(const ContainerNode& root, ElementType* current)
+    : ElementIterator<ElementType>(&root, current)
 {
 }
@@ -101 +101 @@
 
 template <typename ElementType>
-inline ElementDescendantConstIterator<ElementType>::ElementDescendantConstIterator(const ContainerNode* root)
-    : ElementConstIterator<ElementType>(root)
-
-{
-}
-
-template <typename ElementType>
-inline ElementDescendantConstIterator<ElementType>::ElementDescendantConstIterator(const ContainerNode* root, const ElementType* current)
-    : ElementConstIterator<ElementType>(root, current)
+inline ElementDescendantConstIterator<ElementType>::ElementDescendantConstIterator(const ContainerNode& root)
+    : ElementConstIterator<ElementType>(&root)
+
+{
+}
+
+template <typename ElementType>
+inline ElementDescendantConstIterator<ElementType>::ElementDescendantConstIterator(const ContainerNode& root, const ElementType* current)
+    : ElementConstIterator<ElementType>(&root, current)
 {
 }
@@ -122 +122 @@
 
 template <typename ElementType>
-inline ElementDescendantIteratorAdapter<ElementType>::ElementDescendantIteratorAdapter(ContainerNode* root)
+inline ElementDescendantIteratorAdapter<ElementType>::ElementDescendantIteratorAdapter(ContainerNode& root)
     : m_root(root)
 {
@@ -130 +130 @@
 inline ElementDescendantIterator<ElementType> ElementDescendantIteratorAdapter<ElementType>::begin()
 {
-    return ElementDescendantIterator<ElementType>(m_root, Traversal<ElementType>::firstWithin(m_root));
+    return ElementDescendantIterator<ElementType>(m_root, Traversal<ElementType>::firstWithin(&m_root));
 }
 
@@ -142 +142 @@
 inline ElementType* ElementDescendantIteratorAdapter<ElementType>::first()
 {
-    return Traversal<ElementType>::firstWithin(m_root);
+    return Traversal<ElementType>::firstWithin(&m_root);
 }
 
@@ -148 +148 @@
 inline ElementType* ElementDescendantIteratorAdapter<ElementType>::last()
 {
-    return Traversal<ElementType>::lastWithin(m_root);
+    return Traversal<ElementType>::lastWithin(&m_root);
 }
 
@@ -154 +154 @@
 
 template <typename ElementType>
-inline ElementDescendantConstIteratorAdapter<ElementType>::ElementDescendantConstIteratorAdapter(const ContainerNode* root)
+inline ElementDescendantConstIteratorAdapter<ElementType>::ElementDescendantConstIteratorAdapter(const ContainerNode& root)
     : m_root(root)
 {
@@ -162 +162 @@
 inline ElementDescendantConstIterator<ElementType> ElementDescendantConstIteratorAdapter<ElementType>::begin() const
 {
-    return ElementDescendantConstIterator<ElementType>(m_root, Traversal<ElementType>::firstWithin(m_root));
+    return ElementDescendantConstIterator<ElementType>(m_root, Traversal<ElementType>::firstWithin(&m_root));
 }
 
@@ -174 +174 @@
 inline const ElementType* ElementDescendantConstIteratorAdapter<ElementType>::first() const
 {
-    return Traversal<ElementType>::firstWithin(m_root);
+    return Traversal<ElementType>::firstWithin(&m_root);
 }
 
@@ -180 +180 @@
 inline const ElementType* ElementDescendantConstIteratorAdapter<ElementType>::last() const
 {
-    return Traversal<ElementType>::lastWithin(m_root);
+    return Traversal<ElementType>::lastWithin(&m_root);
 }
 
 // Standalone functions
 
-inline ElementDescendantIteratorAdapter<Element> elementDescendants(ContainerNode* root)
+inline ElementDescendantIteratorAdapter<Element> elementDescendants(ContainerNode& root)
 {
     return ElementDescendantIteratorAdapter<Element>(root);
@@ -191 +191 @@
 
 template <typename ElementType>
-inline ElementDescendantIteratorAdapter<ElementType> descendantsOfType(ContainerNode* root)
+inline ElementDescendantIteratorAdapter<ElementType> descendantsOfType(ContainerNode& root)
 {
     return ElementDescendantIteratorAdapter<ElementType>(root);
 }
 
-inline ElementDescendantConstIteratorAdapter<Element> elementDescendants(const ContainerNode* root)
+inline ElementDescendantConstIteratorAdapter<Element> elementDescendants(const ContainerNode& root)
 {
     return ElementDescendantConstIteratorAdapter<Element>(root);
@@ -202 +202 @@
 
 template <typename ElementType>
-inline ElementDescendantConstIteratorAdapter<ElementType> descendantsOfType(const ContainerNode* root)
+inline ElementDescendantConstIteratorAdapter<ElementType> descendantsOfType(const ContainerNode& root)
 {
     return ElementDescendantConstIteratorAdapter<ElementType>(root);

trunk/Source/WebCore/dom/SelectorQuery.cpp

@@ -168 +168 @@
 static inline void elementsForLocalName(const ContainerNode& rootNode, const AtomicString& localName, typename SelectorQueryTrait::OutputType& output)
 {
-    auto descendants = elementDescendants(&const_cast<ContainerNode&>(rootNode));
+    auto descendants = elementDescendants(const_cast<ContainerNode&>(rootNode));
     for (auto element = descendants.begin(), end = descendants.end(); element != end; ++element) {
         if (element->tagQName().localName() == localName) {
@@ -181 +181 @@
 static inline void anyElement(const ContainerNode& rootNode, typename SelectorQueryTrait::OutputType& output)
 {
-    auto descendants = elementDescendants(&const_cast<ContainerNode&>(rootNode));
+    auto descendants = elementDescendants(const_cast<ContainerNode&>(rootNode));
     for (auto element = descendants.begin(), end = descendants.end(); element != end; ++element) {
         SelectorQueryTrait::appendOutputForElement(output, &*element);
@@ -210 +210 @@
     } else {
         // Fallback: NamespaceURI is set, selectorLocalName may be starAtom.
-        auto descendants = elementDescendants(&const_cast<ContainerNode&>(rootNode));
+        auto descendants = elementDescendants(const_cast<ContainerNode&>(rootNode));
         for (auto element = descendants.begin(), end = descendants.end(); element != end; ++element) {
             if (element->namespaceURI() == selectorNamespaceURI && (selectorLocalName == starAtom || element->tagQName().localName() == selectorLocalName)) {
@@ -233 +233 @@
 
     const AtomicString& className = selectorData.selector->value();
-    auto descendants = elementDescendants(&const_cast<ContainerNode&>(rootNode));
+    auto descendants = elementDescendants(const_cast<ContainerNode&>(rootNode));
     for (auto element = descendants.begin(), end = descendants.end(); element != end; ++element) {
         if (element->hasClass() && element->classNames().contains(className)) {
@@ -248 +248 @@
     ASSERT(m_selectors.size() == 1);
 
-    auto descendants = elementDescendants(&const_cast<ContainerNode&>(rootNode));
+    auto descendants = elementDescendants(const_cast<ContainerNode&>(rootNode));
     for (auto element = descendants.begin(), end = descendants.end(); element != end; ++element) {
         if (selectorMatches(selectorData, *element, rootNode)) {
@@ -262 +262 @@
 {
     unsigned selectorCount = m_selectors.size();
-    auto descendants = elementDescendants(&const_cast<ContainerNode&>(rootNode));
+    auto descendants = elementDescendants(const_cast<ContainerNode&>(rootNode));
     for (auto element = descendants.begin(), end = descendants.end(); element != end; ++element) {
         for (unsigned i = 0; i < selectorCount; ++i) {

trunk/Source/WebCore/dom/TreeScope.cpp

@@ -301 +301 @@
         m_labelsByForAttribute = adoptPtr(new DocumentOrderedMap);
 
-        auto labelDescendants = descendantsOfType<HTMLLabelElement>(rootNode());
+        auto labelDescendants = descendantsOfType<HTMLLabelElement>(*rootNode());
         for (auto label = labelDescendants.begin(), end = labelDescendants.end(); label != end; ++label) {
             const AtomicString& forValue = label->fastGetAttribute(forAttr);
@@ -343 +343 @@
     if (Element* element = getElementById(name))
         return element;
-    auto anchorDescendants = descendantsOfType<HTMLAnchorElement>(rootNode());
+    auto anchorDescendants = descendantsOfType<HTMLAnchorElement>(*rootNode());
     for (auto anchor = anchorDescendants.begin(), end = anchorDescendants.end(); anchor != end; ++anchor) {
         if (rootNode()->document().inQuirksMode()) {

trunk/Source/WebCore/editing/ApplyStyleCommand.cpp

@@ -445 +445 @@
 
     Vector<Element*> toRemove;
-    for (auto child = elementChildren(dummySpanAncestor).begin(), end = elementChildren(dummySpanAncestor).end(); child != end; ++child) {
+    auto children = elementChildren(*dummySpanAncestor);
+    for (auto child = children.begin(), end = children.end(); child != end; ++child) {
         if (isSpanWithoutAttributesOrUnstyledStyleSpan(&*child))
             toRemove.append(&*child);

trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp

@@ -713 +713 @@
     Vector<Element*> toRemove;
 
-    auto it = elementDescendants(fragment.fragment()).begin();
-    auto end = elementDescendants(fragment.fragment()).end();
+    auto it = elementDescendants(*fragment.fragment()).begin();
+    auto end = elementDescendants(*fragment.fragment()).end();
     while (it != end) {
         if (it->hasTagName(baseTag) || it->hasTagName(linkTag) || it->hasTagName(metaTag) || it->hasTagName(styleTag) || isHTMLTitleElement(*it)) {

trunk/Source/WebCore/editing/markup.cpp

@@ -102 +102 @@
     URL parsedBaseURL(ParsedURLString, baseURL);
 
-    for (auto element = elementDescendants(fragment).begin(), end = elementDescendants(fragment).end(); element != end; ++element) {
+    auto descendants = elementDescendants(*fragment);
+    for (auto element = descendants.begin(), end = descendants.end(); element != end; ++element) {
         if (!element->hasAttributes())
             continue;

trunk/Source/WebCore/html/HTMLAppletElement.cpp

@@ -149 +149 @@
     }
 
-    auto paramChildren = childrenOfType<HTMLParamElement>(this);
+    auto paramChildren = childrenOfType<HTMLParamElement>(*this);
     for (auto param = paramChildren.begin(), end = paramChildren.end(); param != end; ++param) {
         if (param->name().isEmpty())

trunk/Source/WebCore/html/HTMLElement.cpp

@@ -748 +748 @@
 bool HTMLElement::translate() const
 {
-    auto lineage = lineageOfType<HTMLElement>(this);
+    auto lineage = lineageOfType<HTMLElement>(*this);
     for (auto element = lineage.begin(), end = lineage.end(); element != end; ++element) {
         TranslateAttributeMode mode = element->translateAttributeMode();
@@ -955 +955 @@
         setHasDirAutoFlagRecursively(oldMarkedNode, false);
 
-    auto lineage = lineageOfType<HTMLElement>(this);
+    auto lineage = lineageOfType<HTMLElement>(*this);
     for (auto elementToAdjust = lineage.begin(), end = lineage.end(); elementToAdjust != end; ++elementToAdjust) {
         if (elementAffectsDirectionality(&*elementToAdjust)) {

trunk/Source/WebCore/html/HTMLFieldSetElement.cpp

@@ -52 +52 @@
 void HTMLFieldSetElement::invalidateDisabledStateUnder(Element* base)
 {
-    auto formControlDescendants = descendantsOfType<HTMLFormControlElement>(base);
+    auto formControlDescendants = descendantsOfType<HTMLFormControlElement>(*base);
     for (auto control = formControlDescendants.begin(), end = formControlDescendants.end(); control != end; ++control)
         control->ancestorDisabledStateWasChanged();
@@ -68 +68 @@
     HTMLFormControlElement::childrenChanged(change);
 
-    auto legendChildren = childrenOfType<HTMLLegendElement>(this);
+    auto legendChildren = childrenOfType<HTMLLegendElement>(*this);
     for (auto legend = legendChildren.begin(), end = legendChildren.end(); legend != end; ++legend)
         invalidateDisabledStateUnder(&*legend);
@@ -91 +91 @@
 HTMLLegendElement* HTMLFieldSetElement::legend() const
 {
-    return const_cast<HTMLLegendElement*>(descendantsOfType<HTMLLegendElement>(this).first());
+    return const_cast<HTMLLegendElement*>(descendantsOfType<HTMLLegendElement>(*this).first());
 }
 
@@ -109 +109 @@
     m_associatedElements.clear();
 
-    auto descendants = elementDescendants(const_cast<HTMLFieldSetElement*>(this));
+    auto descendants = elementDescendants(const_cast<HTMLFieldSetElement&>(*this));
     for (auto element = descendants.begin(), end = descendants.end(); element != end; ++element) {
         if (element->hasTagName(objectTag))

trunk/Source/WebCore/html/HTMLFrameSetElement.cpp

@@ -166 +166 @@
 HTMLFrameSetElement* HTMLFrameSetElement::findContaining(Element* descendant)
 {
-    return ancestorsOfType<HTMLFrameSetElement>(descendant).first();
+    return ancestorsOfType<HTMLFrameSetElement>(*descendant).first();
 }
 

trunk/Source/WebCore/html/HTMLLabelElement.cpp

@@ -68 +68 @@
         // per http://dev.w3.org/html5/spec/Overview.html#the-label-element
         // the form element must be "labelable form-associated element".
-        auto labelableDescendants = descendantsOfType<LabelableElement>(this);
+        auto labelableDescendants = descendantsOfType<LabelableElement>(*this);
         for (auto labelableElement = labelableDescendants.begin(), end = labelableDescendants.end(); labelableElement != end; ++labelableElement) {
             if (labelableElement->supportLabels())

trunk/Source/WebCore/html/HTMLLegendElement.cpp

@@ -50 +50 @@
 {
     // Check if there's a fieldset belonging to this legend.
-    auto enclosingFieldset = ancestorsOfType<HTMLFieldSetElement>(this).first();
+    auto enclosingFieldset = ancestorsOfType<HTMLFieldSetElement>(*this).first();
     if (!enclosingFieldset)
         return nullptr;
@@ -56 +56 @@
     // Find first form element inside the fieldset that is not a legend element.
     // FIXME: Should we consider tabindex?
-    return descendantsOfType<HTMLFormControlElement>(enclosingFieldset).first();
+    return descendantsOfType<HTMLFormControlElement>(*enclosingFieldset).first();
 }
 

trunk/Source/WebCore/html/HTMLMapElement.cpp

@@ -63 +63 @@
     HTMLAreaElement* defaultArea = 0;
 
-    for (auto area = descendantsOfType<HTMLAreaElement>(this).begin(), end = descendantsOfType<HTMLAreaElement>(this).end(); area != end; ++area) {
+    auto areaDescendants = descendantsOfType<HTMLAreaElement>(*this);
+    for (auto area = areaDescendants.begin(), end = areaDescendants.end(); area != end; ++area) {
         if (area->isDefault()) {
             if (!defaultArea)

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -559 +559 @@
         return;
 
-    if (descendantsOfType<HTMLTrackElement>(this).first())
+    if (descendantsOfType<HTMLTrackElement>(*this).first())
         scheduleDelayedAction(ConfigureTextTracks);
 #endif
@@ -949 +949 @@
         // element child, then let mode be children and let candidate be the first such 
         // source element child in tree order.
-        if (auto firstSource = childrenOfType<HTMLSourceElement>(this).first()) {
+        if (auto firstSource = childrenOfType<HTMLSourceElement>(*this).first()) {
             mode = children;
             m_nextChildNodeToConsider = firstSource;
@@ -1445 +1445 @@
     if (track->trackType() == TextTrack::TrackElement) {
         trackIsLoaded = false;
-        auto end = childrenOfType<HTMLTrackElement>(this).end();
-        for (auto trackElement = childrenOfType<HTMLTrackElement>(this).begin(); trackElement != end; ++trackElement) {
+        auto trackChildren = childrenOfType<HTMLTrackElement>(*this);
+        for (auto trackElement = trackChildren.begin(), end = trackChildren.end(); trackElement != end; ++trackElement) {
             if (trackElement->track() == track) {
                 if (trackElement->readyState() == HTMLTrackElement::LOADING || trackElement->readyState() == HTMLTrackElement::LOADED)
@@ -1678 +1678 @@
     m_asyncEventQueue.cancelAllEvents();
 
-    auto sourceChildren = childrenOfType<HTMLSourceElement>(this);
+    auto sourceChildren = childrenOfType<HTMLSourceElement>(*this);
     for (auto source = sourceChildren.begin(), end = sourceChildren.end(); source != end; ++source)
         source->cancelPendingErrorEvent();

trunk/Source/WebCore/html/HTMLObjectElement.cpp

@@ -155 +155 @@
     // Scan the PARAM children and store their name/value pairs.
     // Get the URL and type from the params if we don't already have them.
-    auto paramChildren = childrenOfType<HTMLParamElement>(this);
+    auto paramChildren = childrenOfType<HTMLParamElement>(*this);
     for (auto param = paramChildren.begin(), end = paramChildren.end(); param != end; ++param) {
         String name = param->name();
@@ -449 +449 @@
         return true;
 
-    for (auto child = elementChildren(this).begin(), end = elementChildren(this).end(); child != end; ++child) {
+    auto children = elementChildren(*this);
+    for (auto child = children.begin(), end = children.end(); child != end; ++child) {
         if (child->hasTagName(paramTag) && equalIgnoringCase(child->getNameAttribute(), "type")
             && MIMETypeRegistry::isJavaAppletMIMEType(child->getAttribute(valueAttr).string()))

trunk/Source/WebCore/loader/PlaceholderDocument.cpp

@@ -35 +35 @@
     ASSERT(!attached());
 
-    auto children = elementChildren(this);
+    auto children = elementChildren(*this);
     for (auto child = children.begin(), end = children.end(); child != end; ++child)
         Style::attachRenderTree(*child);

trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp

@@ -162 +162 @@
     auto builder = std::make_unique<SVGFilterBuilder>(previousEffect, SourceAlpha::create(this));
 
-    auto attributesChildren = childrenOfType<SVGFilterPrimitiveStandardAttributes>(filter);
+    auto attributesChildren = childrenOfType<SVGFilterPrimitiveStandardAttributes>(*filter);
     for (auto it = attributesChildren.begin(), end = attributesChildren.end(); it != end; ++it) {
         SVGFilterPrimitiveStandardAttributes* effectElement = &*it;

trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp

@@ -222 +222 @@
 
     // Draw all clipPath children into a global mask.
-    auto children = childrenOfType<SVGElement>(&clipPathElement());
+    auto children = childrenOfType<SVGElement>(clipPathElement());
     for (auto it = children.begin(), end = children.end(); it != end; ++it) {
         SVGElement& child = *it;

trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp

@@ -96 +96 @@
     // Add effects to the builder
     auto builder = std::make_unique<SVGFilterBuilder>(SourceGraphic::create(filter), SourceAlpha::create(filter));
-    auto children = childrenOfType<SVGFilterPrimitiveStandardAttributes>(&filterElement());
+    auto children = childrenOfType<SVGFilterPrimitiveStandardAttributes>(filterElement());
     for (auto element = children.begin(), end = children.end(); element != end; ++element) {
         RefPtr<FilterEffect> effect = element->build(builder.get(), filter);

trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp

@@ -120 +120 @@
 
     // Draw the content into the ImageBuffer.
-    auto children = childrenOfType<SVGElement>(&maskElement());
+    auto children = childrenOfType<SVGElement>(maskElement());
     for (auto it = children.begin(), end = children.end(); it != end; ++it) {
         SVGElement& child = *it;

trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp

@@ -273 +273 @@
 
     // Draw the content into the ImageBuffer.
-    auto children = childrenOfType<SVGElement>(attributes.patternContentElement());
+    auto children = childrenOfType<SVGElement>(*attributes.patternContentElement());
     for (auto it = children.begin(), end = children.end(); it != end; ++it) {
         const SVGElement& child = *it;

trunk/Source/WebCore/svg/SVGAltGlyphDefElement.cpp

@@ -90 +90 @@
     bool foundFirstAltGlyphItem = false;
 
-    auto svgChildren = childrenOfType<SVGElement>(this);
+    auto svgChildren = childrenOfType<SVGElement>(*this);
     for (auto it = svgChildren.begin(), end = svgChildren.end(); it != end; ++it) {
         const SVGElement& child = *it;

trunk/Source/WebCore/svg/SVGAltGlyphItemElement.cpp

@@ -51 +51 @@
     // there is at least one glyph.
 
-    for (auto glyphRef = childrenOfType<SVGGlyphRefElement>(this).begin(), end = childrenOfType<SVGGlyphRefElement>(this).end(); glyphRef != end; ++glyphRef) {
+    auto glyphChildren = childrenOfType<SVGGlyphRefElement>(*this);
+    for (auto glyphRef = glyphChildren.begin(), end = glyphChildren.end(); glyphRef != end; ++glyphRef) {
         String referredGlyphName;
         if (glyphRef->hasValidGlyphElement(referredGlyphName))

trunk/Source/WebCore/svg/SVGAnimateMotionElement.cpp

@@ -140 +140 @@
     bool foundMPath = false;
 
-    auto mPathChildren = childrenOfType<SVGMPathElement>(this);
+    auto mPathChildren = childrenOfType<SVGMPathElement>(*this);
     for (auto mPath = mPathChildren.begin(), end = mPathChildren.end(); mPath != end; ++mPath) {
         SVGPathElement* pathElement = mPath->pathElement();

trunk/Source/WebCore/svg/SVGElement.cpp

@@ -511 +511 @@
 bool SVGElement::haveLoadedRequiredResources()
 {
-    auto svgChildren = childrenOfType<SVGElement>(this);
+    auto svgChildren = childrenOfType<SVGElement>(*this);
     for (auto child = svgChildren.begin(), end = svgChildren.end(); child != end; ++child) {
         if (!child->haveLoadedRequiredResources())
@@ -926 +926 @@
     // If we aren't an instance in a <use> or the <use> title was not found, then find the first
     // <title> child of this element.
-    auto firstTitle = descendantsOfType<SVGTitleElement>(this).first();
+    auto firstTitle = descendantsOfType<SVGTitleElement>(*this).first();
     return firstTitle ? const_cast<SVGTitleElement*>(firstTitle)->innerText() : String();
 }

trunk/Source/WebCore/svg/SVGFEComponentTransferElement.cpp

@@ -91 +91 @@
     ComponentTransferFunction alpha;
 
-    for (auto child = childrenOfType<SVGElement>(this).begin(), end = childrenOfType<SVGElement>(this).end(); child != end; ++child) {
+    auto children = childrenOfType<SVGElement>(*this);
+    for (auto child = children.begin(), end = children.end(); child != end; ++child) {
         SVGElement* element = &*child;
         if (isSVGFEFuncRElement(element))

trunk/Source/WebCore/svg/SVGFELightElement.cpp

@@ -72 +72 @@
 SVGFELightElement* SVGFELightElement::findLightElement(const SVGElement* svgElement)
 {
-    for (auto child = childrenOfType<SVGElement>(svgElement).begin(), end = childrenOfType<SVGElement>(svgElement).end(); child != end; ++child) {
+    auto children = childrenOfType<SVGElement>(*svgElement);
+    for (auto child = children.begin(), end = children.end(); child != end; ++child) {
         if (isSVGFEDistantLightElement(*child) || isSVGFEPointLightElement(*child) || isSVGFESpotLightElement(*child))
             return static_cast<SVGFELightElement*>(const_cast<SVGElement*>(&*child));

trunk/Source/WebCore/svg/SVGFEMergeElement.cpp

@@ -48 +48 @@
     FilterEffectVector& mergeInputs = effect->inputEffects();
 
-    for (auto mergeNode = childrenOfType<SVGFEMergeNodeElement>(this).begin(), end = childrenOfType<SVGFEMergeNodeElement>(this).end(); mergeNode != end; ++mergeNode) {
+    auto children = childrenOfType<SVGFEMergeNodeElement>(*this);
+    for (auto mergeNode = children.begin(), end = children.end(); mergeNode != end; ++mergeNode) {
         FilterEffect* mergeEffect = filterBuilder->getEffectById(mergeNode->in1());
         if (!mergeEffect)

trunk/Source/WebCore/svg/SVGFontElement.cpp

@@ -72 +72 @@
 const SVGMissingGlyphElement* SVGFontElement::firstMissingGlyphElement() const
 {
-    return childrenOfType<SVGMissingGlyphElement>(this).first();
+    return childrenOfType<SVGMissingGlyphElement>(*this).first();
 }
 
@@ -119 +119 @@
     const SVGMissingGlyphElement* firstMissingGlyphElement = nullptr;
     Vector<String> ligatures;
-    for (auto child = childrenOfType<SVGElement>(this).begin(), end = childrenOfType<SVGElement>(this).end(); child != end; ++child) {
+    auto children = childrenOfType<SVGElement>(*this);
+    for (auto child = children.begin(), end = children.end(); child != end; ++child) {
         SVGElement* element = &*child;
         if (isSVGGlyphElement(element)) {

trunk/Source/WebCore/svg/SVGFontFaceElement.cpp

@@ -229 +229 @@
 
     // we currently ignore all but the first src element, alternatively we could concat them
-    auto srcElement = childrenOfType<SVGFontFaceSrcElement>(this).first();
+    auto srcElement = childrenOfType<SVGFontFaceSrcElement>(*this).first();
 
     bool describesParentFont = isSVGFontElement(parentNode());

trunk/Source/WebCore/svg/SVGFontFaceSrcElement.cpp

@@ -49 +49 @@
 {
     RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
-    auto svgChildren = childrenOfType<SVGElement>(this);
+    auto svgChildren = childrenOfType<SVGElement>(*this);
     for (auto child = svgChildren.begin(), end = svgChildren.end(); child != end; ++child) {
         RefPtr<CSSFontFaceSrcValue> srcValue;

trunk/Source/WebCore/svg/SVGGradientElement.cpp

@@ -142 +142 @@
     Vector<Gradient::ColorStop> stops;
 
-    auto stopChildren = childrenOfType<SVGStopElement>(this);
+    auto stopChildren = childrenOfType<SVGStopElement>(*this);
     float previousOffset = 0.0f;
 

trunk/Source/WebCore/svg/SVGSVGElement.cpp

@@ -338 +338 @@
     Vector<Ref<Element>> elements;
 
-    auto svgDescendants = descendantsOfType<SVGElement>(referenceElement ? referenceElement : this);
+    auto svgDescendants = descendantsOfType<SVGElement>(*(referenceElement ? referenceElement : this));
     for (auto it = svgDescendants.begin(), end = svgDescendants.end(); it != end; ++it) {
         const SVGElement* svgElement = &*it;
@@ -778 +778 @@
     // Fall back to traversing our subtree. Duplicate ids are allowed, the first found will
     // be returned.
-    for (auto element = elementDescendants(this).begin(), end = elementDescendants(this).end(); element != end; ++element) {
+    auto descendants = elementDescendants(*this);
+    for (auto element = descendants.begin(), end = descendants.end(); element != end; ++element) {
         if (element->getIdAttribute() == id)
             return &*element;

trunk/Source/WebCore/svg/SVGSwitchElement.cpp

@@ -54 +54 @@
     // FIXME: This function does not do what the comment below implies it does.
     // It will create a renderer for any valid SVG element children, not just the first one.
-    auto svgChildren = childrenOfType<SVGElement>(this);
+    auto svgChildren = childrenOfType<SVGElement>(*this);
     for (auto element = svgChildren.begin(), end = svgChildren.end(); element != end; ++element) {
         if (!element->isValid())

trunk/Source/WebCore/svg/SVGUseElement.cpp

@@ -370 +370 @@
 static bool subtreeContainsDisallowedElement(SVGElement& start)
 {
-    auto descendants = elementDescendants(&start);
+    auto descendants = elementDescendants(start);
     for (auto element = descendants.begin(), end = descendants.end(); element != end; ++element) {
         if (isDisallowedElement(*element))
@@ -607 +607 @@
     // its correspondingElement that is an SVGRectElement object.
 
-    auto svgChildren = childrenOfType<SVGElement>(target);
+    auto svgChildren = childrenOfType<SVGElement>(*target);
     for (auto element = svgChildren.begin(), end = svgChildren.end(); element != end; ++element) {
         // Skip any non-svg nodes or any disallowed element.
@@ -665 +665 @@
     ASSERT(!subtree.inDocument());
     Vector<Element*> toRemove;
-    auto it = elementDescendants(&subtree).begin();
-    auto end = elementDescendants(&subtree).end();
+    auto it = elementDescendants(subtree).begin();
+    auto end = elementDescendants(subtree).end();
     while (it != end) {
         if (isDisallowedElement(*it)) {

trunk/Source/WebCore/svg/animation/SMILTimeContainer.cpp

@@ -224 +224 @@
     unsigned timingElementCount = 0;
 
-    auto smilDescendants = descendantsOfType<SVGSMILElement>(m_ownerSVGElement);
+    auto smilDescendants = descendantsOfType<SVGSMILElement>(*m_ownerSVGElement);
     for (auto smilElement = smilDescendants.begin(), end = smilDescendants.end(); smilElement != end; ++smilElement)
         smilElement->setDocumentOrderIndex(timingElementCount++);

trunk/Source/WebCore/svg/graphics/SVGImage.cpp

@@ -76 +76 @@
 
     // Don't allow foreignObject elements since they can leak information with arbitrary HTML (like spellcheck or control theme).
-    if (descendantsOfType<SVGForeignObjectElement>(rootElement).first())
+    if (descendantsOfType<SVGForeignObjectElement>(*rootElement).first())
         return false;