Changeset 161643 in webkit

Timestamp:

Jan 10, 2014 9:45:19 AM (10 years ago)

Author:

Antti Koivisto

Message:

Use element iterators more
​https://bugs.webkit.org/show_bug.cgi?id=126756

Reviewed by Anders Carlsson.

• dom/VisitedLinkState.cpp:

(WebCore::VisitedLinkState::invalidateStyleForAllLinks):
(WebCore::VisitedLinkState::invalidateStyleForLink):

• html/HTMLMeterElement.cpp:

(WebCore::HTMLMeterElement::renderMeter):

• html/HTMLProgressElement.cpp:

(WebCore::HTMLProgressElement::renderProgress):

• html/shadow/ContentDistributor.cpp:

(WebCore::ContentDistributor::ensureInsertionPointList):

• style/StyleResolveTree.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/VisitedLinkState.cpp (modified) (3 diffs)
• html/HTMLMeterElement.cpp (modified) (2 diffs)
• html/HTMLProgressElement.cpp (modified) (2 diffs)
• html/shadow/ContentDistributor.cpp (modified) (2 diffs)
• style/StyleResolveTree.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-10  Antti Koivisto  <antti@apple.com>
+
+        Use element iterators more
+        https://bugs.webkit.org/show_bug.cgi?id=126756
+
+        Reviewed by Anders Carlsson.
+
+        * dom/VisitedLinkState.cpp:
+        (WebCore::VisitedLinkState::invalidateStyleForAllLinks):
+        (WebCore::VisitedLinkState::invalidateStyleForLink):
+        * html/HTMLMeterElement.cpp:
+        (WebCore::HTMLMeterElement::renderMeter):
+        * html/HTMLProgressElement.cpp:
+        (WebCore::HTMLProgressElement::renderProgress):
+        * html/shadow/ContentDistributor.cpp:
+        (WebCore::ContentDistributor::ensureInsertionPointList):
+        * style/StyleResolveTree.cpp:
+
 2014-01-10  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/dom/VisitedLinkState.cpp

@@ -30 +30 @@
 #include "VisitedLinkState.h"
 
-#include "ElementTraversal.h"
+#include "ElementIterator.h"
 #include "Frame.h"
 #include "HTMLAnchorElement.h"
@@ -68 +68 @@
     if (m_linksCheckedForVisitedState.isEmpty())
         return;
-    for (Element* element = ElementTraversal::firstWithin(&m_document); element; element = ElementTraversal::next(element)) {
-        if (element->isLink())
-            element->setNeedsStyleRecalc();
+    for (auto& element : descendantsOfType<Element>(m_document)) {
+        if (element.isLink())
+            element.setNeedsStyleRecalc();
     }
 }
@@ -87 +87 @@
     if (!m_linksCheckedForVisitedState.contains(linkHash))
         return;
-    for (Element* element = ElementTraversal::firstWithin(&m_document); element; element = ElementTraversal::next(element)) {
-        if (linkHashForElement(m_document, *element) == linkHash)
-            element->setNeedsStyleRecalc();
+    for (auto& element : descendantsOfType<Element>(m_document)) {
+        if (linkHashForElement(m_document, element) == linkHash)
+            element.setNeedsStyleRecalc();
     }
 }

trunk/Source/WebCore/html/HTMLMeterElement.cpp

@@ -24 +24 @@
 
 #include "Attribute.h"
-#include "ElementTraversal.h"
+#include "ElementIterator.h"
 #include "EventNames.h"
 #include "ExceptionCode.h"
@@ -223 +223 @@
     if (renderer() && renderer()->isMeter())
         return toRenderMeter(renderer());
-    return toRenderMeter(ElementTraversal::firstWithin(userAgentShadowRoot())->renderer());
+    return toRenderMeter(descendantsOfType<Element>(*userAgentShadowRoot()).first()->renderer());
 }
 

trunk/Source/WebCore/html/HTMLProgressElement.cpp

@@ -24 +24 @@
 
 #include "Attribute.h"
-#include "ElementTraversal.h"
+#include "ElementIterator.h"
 #include "EventNames.h"
 #include "ExceptionCode.h"
@@ -76 +76 @@
     if (renderer() && renderer()->isProgress())
         return toRenderProgress(renderer());
-    return toRenderProgress(ElementTraversal::firstWithin(userAgentShadowRoot())->renderer());
+    return toRenderProgress(descendantsOfType<Element>(*userAgentShadowRoot()).first()->renderer());
 }
 

trunk/Source/WebCore/html/shadow/ContentDistributor.cpp

@@ -28 +28 @@
 #include "ContentDistributor.h"
 
-#include "ElementTraversal.h"
+#include "ElementIterator.h"
 #include "InsertionPoint.h"
 
@@ -57 +57 @@
     ASSERT(m_insertionPointList.isEmpty());
 
-    for (Element* element = ElementTraversal::firstWithin(shadowRoot); element; element = ElementTraversal::next(element, shadowRoot)) {
-        if (element->isInsertionPoint())
-            m_insertionPointList.append(toInsertionPoint(element));
+    for (auto& element : descendantsOfType<Element>(*shadowRoot)) {
+        if (element.isInsertionPoint())
+            m_insertionPointList.append(toInsertionPoint(&element));
     }
 

trunk/Source/WebCore/style/StyleResolveTree.cpp

@@ -33 +33 @@
 #include "ElementIterator.h"
 #include "ElementRareData.h"
-#include "ElementTraversal.h"
 #include "FlowThreadController.h"
 #include "InsertionPoint.h"