Changeset 156612 in webkit

Timestamp:

Sep 28, 2013, 1:20:56 PM (12 years ago)

Author:

Antti Koivisto

Message:

Add first()/last() to ElementIteratorAdapters
​https://bugs.webkit.org/show_bug.cgi?id=122067

Reviewed by Darin Adler.

Add a convenient way for getting the first and last element if it exists.

Use it in some places.

• accessibility/AccessibilityNodeObject.cpp:

(WebCore::AccessibilityNodeObject::canvasHasFallbackContent):

• css/CSSFontFaceSource.cpp:

(WebCore::CSSFontFaceSource::getFontData):

• dom/Document.cpp:

(WebCore::Document::childrenChanged):
(WebCore::Document::removeTitle):

• dom/ElementChildIterator.h:

(WebCore::::first):
(WebCore::::last):

• dom/ElementDescendantIterator.h:

(WebCore::::first):
(WebCore::::last):

• html/HTMLFieldSetElement.cpp:

(WebCore::HTMLFieldSetElement::legend):

• html/HTMLLegendElement.cpp:

(WebCore::HTMLLegendElement::associatedControl):

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::finishParsingChildren):
(WebCore::HTMLMediaElement::selectMediaResource):

• svg/SVGElement.cpp:

(WebCore::SVGElement::title):

• svg/SVGFontFaceElement.cpp:

(WebCore::SVGFontFaceElement::rebuildFontFace):

• svg/graphics/SVGImage.cpp:

(WebCore::SVGImage::hasSingleSecurityOrigin):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AccessibilityNodeObject.cpp (modified) (1 diff)
• css/CSSFontFaceSource.cpp (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)
• dom/ElementChildIterator.h (modified) (4 diffs)
• dom/ElementDescendantIterator.h (modified) (4 diffs)
• html/HTMLFieldSetElement.cpp (modified) (1 diff)
• html/HTMLLegendElement.cpp (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (2 diffs)
• svg/SVGElement.cpp (modified) (1 diff)
• svg/SVGFontFaceElement.cpp (modified) (1 diff)
• svg/graphics/SVGImage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-28  Antti Koivisto  <antti@apple.com>
+
+        Add first()/last() to ElementIteratorAdapters
+        https://bugs.webkit.org/show_bug.cgi?id=122067
+
+        Reviewed by Darin Adler.
+
+        Add a convenient way for getting the first and last element if it exists.
+        
+        Use it in some places.
+
+        * accessibility/AccessibilityNodeObject.cpp:
+        (WebCore::AccessibilityNodeObject::canvasHasFallbackContent):
+        * css/CSSFontFaceSource.cpp:
+        (WebCore::CSSFontFaceSource::getFontData):
+        * dom/Document.cpp:
+        (WebCore::Document::childrenChanged):
+        (WebCore::Document::removeTitle):
+        * dom/ElementChildIterator.h:
+        (WebCore::::first):
+        (WebCore::::last):
+        * dom/ElementDescendantIterator.h:
+        (WebCore::::first):
+        (WebCore::::last):
+        * html/HTMLFieldSetElement.cpp:
+        (WebCore::HTMLFieldSetElement::legend):
+        * html/HTMLLegendElement.cpp:
+        (WebCore::HTMLLegendElement::associatedControl):
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::finishParsingChildren):
+        (WebCore::HTMLMediaElement::selectMediaResource):
+        * svg/SVGElement.cpp:
+        (WebCore::SVGElement::title):
+        * svg/SVGFontFaceElement.cpp:
+        (WebCore::SVGFontFaceElement::rebuildFontFace):
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::hasSingleSecurityOrigin):
+
 2013-09-28  Mark Rowe  <mrowe@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp

@@ -424 +424 @@
     // content. If it has no children or its only children are not elements
     // (e.g. just text nodes), it doesn't have fallback content.
-    return elementChildren(canvasElement).begin() != elementChildren(canvasElement).end();
+    return elementChildren(canvasElement).first();
 }
 

trunk/Source/WebCore/css/CSSFontFaceSource.cpp

@@ -140 +140 @@
                     return 0;
 
-                auto fontFaceChildren = childrenOfType<SVGFontFaceElement>(m_externalSVGFontElement.get());
-                auto firstFontFace = fontFaceChildren.begin();
-                if (firstFontFace != fontFaceChildren.end()) {
+                if (auto firstFontFace = childrenOfType<SVGFontFaceElement>(m_externalSVGFontElement.get()).first()) {
                     if (!m_svgFontFaceElement) {
                         // We're created using a CSS @font-face rule, that means we're not associated with a SVGFontFaceElement.
                         // Use the imported <font-face> tag as referencing font-face element for these cases.
-                        m_svgFontFaceElement = &*firstFontFace;
+                        m_svgFontFaceElement = firstFontFace;
                     }
 
-                    fontData = SimpleFontData::create(SVGFontData::create(&*firstFontFace), fontDescription.computedPixelSize(), syntheticBold, syntheticItalic);
+                    fontData = SimpleFontData::create(SVGFontData::create(firstFontFace), fontDescription.computedPixelSize(), syntheticBold, syntheticItalic);
                 }
             } else

trunk/Source/WebCore/dom/Document.cpp

@@ -795 +795 @@
 #endif
 
-    Element* newDocumentElement = 0;
-    auto firstElementChild = elementChildren(this).begin();
-    if (firstElementChild != elementChildren(this).end())
-        newDocumentElement = &*firstElementChild;
+    Element* newDocumentElement = elementChildren(this).first();
 
     if (newDocumentElement == m_documentElement)
@@ -1587 +1584 @@
     // Update title based on first title element in the head, if one exists.
     if (HTMLElement* headElement = head()) {
-        auto firstTitle = childrenOfType<HTMLTitleElement>(headElement).begin();
-        if (firstTitle != childrenOfType<HTMLTitleElement>(headElement).end())
-            setTitleElement(firstTitle->textWithDirection(), &*firstTitle);
+        if (auto firstTitle = childrenOfType<HTMLTitleElement>(headElement).first())
+            setTitleElement(firstTitle->textWithDirection(), firstTitle);
     }
 

trunk/Source/WebCore/dom/ElementChildIterator.h

@@ -53 +53 @@
     ElementChildIterator<ElementType> begin();
     ElementChildIterator<ElementType> end();
+    ElementType* first();
+    ElementType* last();
 
 private:
@@ -64 +66 @@
     ElementChildConstIterator<ElementType> begin() const;
     ElementChildConstIterator<ElementType> end() const;
+    const ElementType* first() const;
+    const ElementType* last() const;
 
 private:
@@ -134 +138 @@
 }
 
+template <typename ElementType>
+inline ElementType* ElementChildIteratorAdapter<ElementType>::first()
+{
+    return Traversal<ElementType>::firstChild(m_root);
+}
+
+template <typename ElementType>
+inline ElementType* ElementChildIteratorAdapter<ElementType>::last()
+{
+    return Traversal<ElementType>::lastChild(m_root);
+}
+
 // ElementChildConstIteratorAdapter
 
@@ -154 +170 @@
 }
 
+template <typename ElementType>
+inline const ElementType* ElementChildConstIteratorAdapter<ElementType>::first() const
+{
+    return Traversal<ElementType>::firstChild(m_root);
+}
+
+template <typename ElementType>
+inline const ElementType* ElementChildConstIteratorAdapter<ElementType>::last() const
+{
+    return Traversal<ElementType>::lastChild(m_root);
+}
+
 // Standalone functions
 

trunk/Source/WebCore/dom/ElementDescendantIterator.h

@@ -53 +53 @@
     ElementDescendantIterator<ElementType> begin();
     ElementDescendantIterator<ElementType> end();
+    ElementType* first();
+    ElementType* last();
 
 private:
@@ -64 +66 @@
     ElementDescendantConstIterator<ElementType> begin() const;
     ElementDescendantConstIterator<ElementType> end() const;
+    const ElementType* first() const;
+    const ElementType* last() const;
 
 private:
@@ -135 +139 @@
 }
 
+template <typename ElementType>
+inline ElementType* ElementDescendantIteratorAdapter<ElementType>::first()
+{
+    return Traversal<ElementType>::firstWithin(m_root);
+}
+
+template <typename ElementType>
+inline ElementType* ElementDescendantIteratorAdapter<ElementType>::last()
+{
+    return Traversal<ElementType>::lastWithin(m_root);
+}
+
 // ElementDescendantConstIteratorAdapter
 
@@ -155 +171 @@
 }
 
+template <typename ElementType>
+inline const ElementType* ElementDescendantConstIteratorAdapter<ElementType>::first() const
+{
+    return Traversal<ElementType>::firstWithin(m_root);
+}
+
+template <typename ElementType>
+inline const ElementType* ElementDescendantConstIteratorAdapter<ElementType>::last() const
+{
+    return Traversal<ElementType>::lastWithin(m_root);
+}
+
 // Standalone functions
 

trunk/Source/WebCore/html/HTMLFieldSetElement.cpp

@@ -91 +91 @@
 const HTMLLegendElement* HTMLFieldSetElement::legend() const
 {
-    auto legendDescendants = descendantsOfType<HTMLLegendElement>(this);
-    auto firstLegend = legendDescendants.begin();
-    if (firstLegend != legendDescendants.end())
-        return &*firstLegend;
-    return nullptr;
+    return descendantsOfType<HTMLLegendElement>(this).first();
 }
 

trunk/Source/WebCore/html/HTMLLegendElement.cpp

@@ -57 +57 @@
     // Find first form element inside the fieldset that is not a legend element.
     // FIXME: Should we consider tabindex?
-    auto fieldsetFormControlDescendants = descendantsOfType<HTMLFormControlElement>(&*enclosingFieldset);
-    auto firstFormControl = fieldsetFormControlDescendants.begin();
-    return firstFormControl != fieldsetFormControlDescendants.end() ? &*firstFormControl : nullptr;
+    return descendantsOfType<HTMLFormControlElement>(&*enclosingFieldset).first();
 }
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -549 +549 @@
         return;
 
-    auto trackDescendants = descendantsOfType<HTMLTrackElement>(this);
-    if (trackDescendants.begin() != trackDescendants.end())
+    if (descendantsOfType<HTMLTrackElement>(this).first())
         scheduleDelayedAction(ConfigureTextTracks);
 #endif
@@ -940 +939 @@
         // element child, then let mode be children and let candidate be the first such 
         // source element child in tree order.
-        auto source = childrenOfType<HTMLSourceElement>(this).begin();
-        if (source != childrenOfType<HTMLSourceElement>(this).end()) {
+        if (auto firstSource = childrenOfType<HTMLSourceElement>(this).first()) {
             mode = children;
-            m_nextChildNodeToConsider = &*source;
+            m_nextChildNodeToConsider = firstSource;
             m_currentSourceNode = 0;
         } else {

trunk/Source/WebCore/svg/SVGElement.cpp

@@ -954 +954 @@
     // 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.
-    // If a title child was found, return the text contents.
-    auto titleDescendants = descendantsOfType<SVGTitleElement>(this);
-    auto firstTitle = titleDescendants.begin();
-    if (firstTitle != titleDescendants.end())
-        return const_cast<SVGTitleElement&>(*firstTitle).innerText();
-
-    // Otherwise return a null/empty string.
-    return String();
+    auto firstTitle = descendantsOfType<SVGTitleElement>(this).first();
+    return firstTitle ? const_cast<SVGTitleElement*>(firstTitle)->innerText() : String();
 }
 

trunk/Source/WebCore/svg/SVGFontFaceElement.cpp

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

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).
-    auto foreignObjectDescendants = descendantsOfType<SVGForeignObjectElement>(rootElement);
-    if (foreignObjectDescendants.begin() != foreignObjectDescendants.end())
+    if (descendantsOfType<SVGForeignObjectElement>(rootElement).first())
         return false;