Changeset 154928 in webkit


Ignore:
Timestamp:
Aug 31, 2013 7:12:00 AM (11 years ago)
Author:
Antti Koivisto
Message:

Rename ChildIterator -> ElementChildIterator, DescendantIterator -> ElementDescendantIterator
​https://bugs.webkit.org/show_bug.cgi?id=120561

Reviewed by Andreas Kling.

New names are more descriptive and consistent. They also put related iterator files close by in file lists.
The types are always used with auto so longer names don't make them any clumsier to use.

For simplicity included all Element iterator types from ElementIterator.h so it is the only file that has
to be included by the clients.

  • GNUmakefile.list.am:
  • Target.pri:
  • WebCore.vcxproj/WebCore.vcxproj:
  • WebCore.xcodeproj/project.pbxproj:
  • accessibility/AccessibilityNodeObject.cpp:
  • accessibility/AccessibilityRenderObject.cpp:
  • accessibility/AccessibilityTable.cpp:
  • css/CSSFontFaceSource.cpp:
  • dom/ChildIterator.h: Removed.
  • dom/DescendantIterator.h: Removed.
  • dom/Document.cpp:
  • dom/ElementChildIterator.h: Copied from Source/WebCore/dom/ChildIterator.h.

(WebCore::::ElementChildIterator):
(WebCore::::operator):
(WebCore::::ElementChildConstIterator):
(WebCore::::ElementChildIteratorAdapter):
(WebCore::::begin):
(WebCore::::end):
(WebCore::::ElementChildConstIteratorAdapter):
(WebCore::elementChildren):
(WebCore::childrenOfType):

  • dom/ElementDescendantIterator.h: Copied from Source/WebCore/dom/DescendantIterator.h.

(WebCore::::ElementDescendantIterator):
(WebCore::::operator):
(WebCore::::ElementDescendantConstIterator):
(WebCore::::ElementDescendantIteratorAdapter):
(WebCore::::begin):
(WebCore::::end):
(WebCore::::ElementDescendantConstIteratorAdapter):
(WebCore::elementDescendants):
(WebCore::descendantsOfType):

  • dom/ElementIterator.h:
  • dom/Node.cpp:
  • dom/TreeScope.cpp:
  • editing/ApplyStyleCommand.cpp:
  • editing/markup.cpp:
  • html/HTMLAppletElement.cpp:
  • html/HTMLFieldSetElement.cpp:
  • html/HTMLLabelElement.cpp:
  • html/HTMLMapElement.cpp:
  • html/HTMLMediaElement.cpp:
  • html/HTMLObjectElement.cpp:
  • loader/PlaceholderDocument.cpp:
  • rendering/FilterEffectRenderer.cpp:
  • style/StyleResolveTree.cpp:
  • svg/SVGElement.cpp:
  • svg/SVGSVGElement.cpp:
  • svg/animation/SMILTimeContainer.cpp:
  • svg/graphics/SVGImage.cpp:
Location:
trunk/Source/WebCore
Files:
28 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r154927 r154928  
     12013-08-31  Antti Koivisto  <antti@apple.com>
     2
     3        Rename ChildIterator -> ElementChildIterator, DescendantIterator -> ElementDescendantIterator
     4        https://bugs.webkit.org/show_bug.cgi?id=120561
     5
     6        Reviewed by Andreas Kling.
     7
     8        New names are more descriptive and consistent. They also put related iterator files close by in file lists.
     9        The types are always used with auto so longer names don't make them any clumsier to use.
     10
     11        For simplicity included all Element iterator types from ElementIterator.h so it is the only file that has
     12        to be included by the clients.
     13
     14        * GNUmakefile.list.am:
     15        * Target.pri:
     16        * WebCore.vcxproj/WebCore.vcxproj:
     17        * WebCore.xcodeproj/project.pbxproj:
     18        * accessibility/AccessibilityNodeObject.cpp:
     19        * accessibility/AccessibilityRenderObject.cpp:
     20        * accessibility/AccessibilityTable.cpp:
     21        * css/CSSFontFaceSource.cpp:
     22        * dom/ChildIterator.h: Removed.
     23        * dom/DescendantIterator.h: Removed.
     24        * dom/Document.cpp:
     25        * dom/ElementChildIterator.h: Copied from Source/WebCore/dom/ChildIterator.h.
     26        (WebCore::::ElementChildIterator):
     27        (WebCore::::operator):
     28        (WebCore::::ElementChildConstIterator):
     29        (WebCore::::ElementChildIteratorAdapter):
     30        (WebCore::::begin):
     31        (WebCore::::end):
     32        (WebCore::::ElementChildConstIteratorAdapter):
     33        (WebCore::elementChildren):
     34        (WebCore::childrenOfType):
     35        * dom/ElementDescendantIterator.h: Copied from Source/WebCore/dom/DescendantIterator.h.
     36        (WebCore::::ElementDescendantIterator):
     37        (WebCore::::operator):
     38        (WebCore::::ElementDescendantConstIterator):
     39        (WebCore::::ElementDescendantIteratorAdapter):
     40        (WebCore::::begin):
     41        (WebCore::::end):
     42        (WebCore::::ElementDescendantConstIteratorAdapter):
     43        (WebCore::elementDescendants):
     44        (WebCore::descendantsOfType):
     45        * dom/ElementIterator.h:
     46        * dom/Node.cpp:
     47        * dom/TreeScope.cpp:
     48        * editing/ApplyStyleCommand.cpp:
     49        * editing/markup.cpp:
     50        * html/HTMLAppletElement.cpp:
     51        * html/HTMLFieldSetElement.cpp:
     52        * html/HTMLLabelElement.cpp:
     53        * html/HTMLMapElement.cpp:
     54        * html/HTMLMediaElement.cpp:
     55        * html/HTMLObjectElement.cpp:
     56        * loader/PlaceholderDocument.cpp:
     57        * rendering/FilterEffectRenderer.cpp:
     58        * style/StyleResolveTree.cpp:
     59        * svg/SVGElement.cpp:
     60        * svg/SVGSVGElement.cpp:
     61        * svg/animation/SMILTimeContainer.cpp:
     62        * svg/graphics/SVGImage.cpp:
     63
    1642013-08-31  Andreas Kling  <akling@apple.com>
    265

  • trunk/Source/WebCore/GNUmakefile.list.am

    r154926 r154928  
    27762776        Source/WebCore/dom/CheckedRadioButtons.cpp \
    27772777        Source/WebCore/dom/CheckedRadioButtons.h \
    2778         Source/WebCore/dom/ChildIterator.h \
    27792778        Source/WebCore/dom/ChildListMutationScope.cpp \
    27802779        Source/WebCore/dom/ChildListMutationScope.h \
    … …  
    28212820        Source/WebCore/dom/default/PlatformMessagePortChannel.cpp \
    28222821        Source/WebCore/dom/default/PlatformMessagePortChannel.h \
    2823         Source/WebCore/dom/DescendantIterator.h \
    28242822        Source/WebCore/dom/DeviceMotionClient.h \
    28252823        Source/WebCore/dom/DeviceMotionController.cpp \
    … …  
    28722870        Source/WebCore/dom/Element.cpp \
    28732871        Source/WebCore/dom/Element.h \
     2872        Source/WebCore/dom/ElementChildIterator.h \
    28742873        Source/WebCore/dom/ElementData.cpp \
    28752874        Source/WebCore/dom/ElementData.h \
     2875        Source/WebCore/dom/ElementDescendantIterator.h \
    28762876        Source/WebCore/dom/ElementIterator.h \
    28772877        Source/WebCore/dom/ElementIteratorAssertions.h \

  • trunk/Source/WebCore/Target.pri

    r154926 r154928  
    15751575    dom/CharacterData.h \
    15761576    dom/CheckedRadioButtons.h \
    1577     dom/ChildIterator.h \
    15781577    dom/ChildNodeList.h \
    15791578    dom/ClassNodeList.h \
    … …  
    15891588    dom/CustomEvent.h \
    15901589    dom/default/PlatformMessagePortChannel.h \
    1591     dom/DescendantIterator.h \
    15921590    dom/DeviceMotionClient.h \
    15931591    dom/DeviceMotionController.h \
    … …  
    16131611    dom/DatasetDOMStringMap.h \
    16141612    dom/Element.h \
     1613    dom/ElementChildIterator.h \
    16151614    dom/ElementData.h \
     1615    dom/ElementDescendantIterator.h \
    16161616    dom/ElementIterator.h \
    16171617    dom/ElementIteratorAssertions.h \

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r154926 r154928  
    2021820218    <ClInclude Include="..\dom\CharacterData.h" />
    2021920219    <ClInclude Include="..\dom\CheckedRadioButtons.h" />
    20220     <ClInclude Include="..\dom\ChildIterator.h" />
    2022120220    <ClInclude Include="..\dom\ChildListMutationScope.h" />
    2022220221    <ClInclude Include="..\dom\ChildNodeList.h" />
    … …  
    2023820237    <ClInclude Include="..\dom\DataTransferItemList.h" />
    2023920238    <ClInclude Include="..\dom\DecodedDataDocumentParser.h" />
    20240     <ClInclude Include="..\dom\DescendantIterator.h" />
    2024120239    <ClInclude Include="..\dom\DeviceMotionClient.h" />
    2024220240    <ClInclude Include="..\dom\DeviceMotionController.h" />
    … …  
    2026520263    <ClInclude Include="..\dom\DOMTimeStamp.h" />
    2026620264    <ClInclude Include="..\dom\Element.h" />
     20265    <ClInclude Include="..\dom\ElementChildIterator.h" />
    2026720266    <ClInclude Include="..\dom\ElementData.h" />
     20267    <ClInclude Include="..\dom\ElementDescendantIterator.h" />
    2026820268    <ClInclude Include="..\dom\ElementIterator.h" />
    2026920269    <ClInclude Include="..\dom\ElementIteratorAssertions.h" />

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r154926 r154928  
    54925492                E45390460EAFD637003695C8 /* SharedTimerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E45390350EAFD637003695C8 /* SharedTimerIOS.mm */; };
    54935493                E462A4A1113E71BE004A4220 /* IntPointHash.h in Headers */ = {isa = PBXBuildFile; fileRef = E462A4A0113E71BE004A4220 /* IntPointHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
    5494                 E46A2B1C17CA65B9000DBCD8 /* DescendantIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = E46A2B1B17CA65B9000DBCD8 /* DescendantIterator.h */; };
    5495                 E46A2B1E17CA76B1000DBCD8 /* ChildIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = E46A2B1D17CA76B1000DBCD8 /* ChildIterator.h */; };
     5494                E46A2B1C17CA65B9000DBCD8 /* ElementDescendantIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = E46A2B1B17CA65B9000DBCD8 /* ElementDescendantIterator.h */; };
     5495                E46A2B1E17CA76B1000DBCD8 /* ElementChildIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = E46A2B1D17CA76B1000DBCD8 /* ElementChildIterator.h */; };
    54965496                E47127CA163438A100ED6F5A /* StyleInvalidationAnalysis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E47A97CE163059FC005DCD99 /* StyleInvalidationAnalysis.cpp */; };
    54975497                E47127CB163438AE00ED6F5A /* StyleInvalidationAnalysis.h in Headers */ = {isa = PBXBuildFile; fileRef = E47A97CF163059FC005DCD99 /* StyleInvalidationAnalysis.h */; };
    … …  
    1226612266                E45390350EAFD637003695C8 /* SharedTimerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SharedTimerIOS.mm; path = ios/SharedTimerIOS.mm; sourceTree = "<group>"; };
    1226712267                E462A4A0113E71BE004A4220 /* IntPointHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntPointHash.h; sourceTree = "<group>"; };
    12268                 E46A2B1B17CA65B9000DBCD8 /* DescendantIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DescendantIterator.h; sourceTree = "<group>"; };
    12269                 E46A2B1D17CA76B1000DBCD8 /* ChildIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildIterator.h; sourceTree = "<group>"; };
     12268                E46A2B1B17CA65B9000DBCD8 /* ElementDescendantIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementDescendantIterator.h; sourceTree = "<group>"; };
     12269                E46A2B1D17CA76B1000DBCD8 /* ElementChildIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementChildIterator.h; sourceTree = "<group>"; };
    1227012270                E4778B7D115A581A00B5D372 /* JSCustomEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCustomEvent.cpp; sourceTree = "<group>"; };
    1227112271                E4778B7E115A581A00B5D372 /* JSCustomEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCustomEvent.h; sourceTree = "<group>"; };
    … …  
    2011420114                                93F925420F7EF5B8007E37C9 /* CheckedRadioButtons.cpp */,
    2011520115                                93F925410F7EF5B8007E37C9 /* CheckedRadioButtons.h */,
    20116                                 E46A2B1D17CA76B1000DBCD8 /* ChildIterator.h */,
    2011720116                                D619A305144E00BE004BC302 /* ChildListMutationScope.cpp */,
    2011820117                                D619A306144E00BE004BC302 /* ChildListMutationScope.h */,
    … …  
    2016220161                                A8C228A011D5722E00D5A7D3 /* DecodedDataDocumentParser.cpp */,
    2016320162                                A8C2289F11D5722E00D5A7D3 /* DecodedDataDocumentParser.h */,
    20164                                 E46A2B1B17CA65B9000DBCD8 /* DescendantIterator.h */,
    2016520163                                31FB1A4F120A5D0600DC02A0 /* DeviceMotionClient.h */,
    2016620164                                31FB1A50120A5D0600DC02A0 /* DeviceMotionController.cpp */,
    … …  
    2022620224                                A8C4A7F509D563270003AC8D /* Element.h */,
    2022720225                                93EEC1EA09C2877700C515D1 /* Element.idl */,
     20226                                E46A2B1D17CA76B1000DBCD8 /* ElementChildIterator.h */,
    2022820227                                B5B7A16F17C1080600E4AA0A /* ElementData.cpp */,
    2022920228                                B5B7A16E17C1048000E4AA0A /* ElementData.h */,
     20229                                E46A2B1B17CA65B9000DBCD8 /* ElementDescendantIterator.h */,
     20230                                E4AE7C1517D1BB950009FB31 /* ElementIterator.h */,
     20231                                E401C27417CE53EC00C41A35 /* ElementIteratorAssertions.h */,
    2023020232                                4FAB48641643A66D00F70C07 /* ElementRareData.cpp */,
    2023120233                                637B7ADE0E8767B800E32194 /* ElementRareData.h */,
    20232                                 E4AE7C1517D1BB950009FB31 /* ElementIterator.h */,
    20233                                 E401C27417CE53EC00C41A35 /* ElementIteratorAssertions.h */,
    2023420234                                E4D58EBA17B8F12800CBDCA8 /* ElementTraversal.h */,
    2023520235                                A8EA7EBA0A1945D000A8EF5F /* Entity.h */,
    … …  
    2117721177                                E1ED8AC30CC49BE000BFC557 /* CSSPrimitiveValueMappings.h in Headers */,
    2117821178                                A80E6CFF0A1989CA007FB8C5 /* CSSProperty.h in Headers */,
    21179                                 E46A2B1E17CA76B1000DBCD8 /* ChildIterator.h in Headers */,
     21179                                E46A2B1E17CA76B1000DBCD8 /* ElementChildIterator.h in Headers */,
    2118021180                                78D02BC6154A18DF00B62D05 /* CSSPropertyAnimation.h in Headers */,
    2118121181                                656580F409D12B20000E61D7 /* CSSPropertyNames.h in Headers */,
    … …  
    2290122901                                A7197F24175689C4007B9442 /* PageThrottler.h in Headers */,
    2290222902                                E1284AE110447D4500EAEB52 /* PageTransitionEvent.h in Headers */,
    22903                                 E46A2B1C17CA65B9000DBCD8 /* DescendantIterator.h in Headers */,
     22903                                E46A2B1C17CA65B9000DBCD8 /* ElementDescendantIterator.h in Headers */,
    2290422904                                51E1ECC30C91C90400DC255B /* PageURLRecord.h in Headers */,
    2290522905                                FFD5B97B135CC97800D5E92A /* PageVisibilityState.h in Headers */,

  • trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp

    r154877 r154928  
    3535#include "AccessibilitySpinButton.h"
    3636#include "AccessibilityTable.h"
    37 #include "ChildIterator.h"
     37#include "ElementIterator.h"
    3838#include "EventNames.h"
    3939#include "FloatRect.h"

  • trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

    r154877 r154928  
    3838#include "CachedImage.h"
    3939#include "Chrome.h"
    40 #include "DescendantIterator.h"
     40#include "ElementIterator.h"
    4141#include "EventNames.h"
    4242#include "FloatRect.h"

  • trunk/Source/WebCore/accessibility/AccessibilityTable.cpp

    r154581 r154928  
    3535#include "AccessibilityTableHeaderContainer.h"
    3636#include "AccessibilityTableRow.h"
    37 #include "ChildIterator.h"
     37#include "ElementIterator.h"
    3838#include "HTMLNames.h"
    3939#include "HTMLTableCaptionElement.h"

  • trunk/Source/WebCore/css/CSSFontFaceSource.cpp

    r154679 r154928  
    3131#include "CachedFont.h"
    3232#include "CachedResourceLoader.h"
    33 #include "ChildIterator.h"
    3433#include "Document.h"
     34#include "ElementIterator.h"
    3535#include "FontCache.h"
    3636#include "FontDescription.h"

  • trunk/Source/WebCore/dom/Document.cpp

    r154927 r154928  
    3838#include "CachedCSSStyleSheet.h"
    3939#include "CachedResourceLoader.h"
    40 #include "ChildIterator.h"
    4140#include "Chrome.h"
    4241#include "ChromeClient.h"
    … …  
    5150#include "DOMWindow.h"
    5251#include "DateComponents.h"
    53 #include "DescendantIterator.h"
    5452#include "Dictionary.h"
    5553#include "DocumentEventQueue.h"
    … …  
    6260#include "Editor.h"
    6361#include "Element.h"
     62#include "ElementIterator.h"
    6463#include "EntityReference.h"
    6564#include "Event.h"

  • trunk/Source/WebCore/dom/ElementChildIterator.h

    r154926 r154928  
    2424 */
    2525
    26 #ifndef ChildIterator_h
    27 #define ChildIterator_h
     26#ifndef ElementChildIterator_h
     27#define ElementChildIterator_h
    2828
    2929#include "ElementIterator.h"
    … …  
    3232
    3333template <typename ElementType>
    34 class ChildIterator : public ElementIterator<ElementType> {
     34class ElementChildIterator : public ElementIterator<ElementType> {
    3535public:
    36     ChildIterator(const ContainerNode* root);
    37     ChildIterator(const ContainerNode* root, ElementType* current);
    38     ChildIterator& operator++();
     36    ElementChildIterator(const ContainerNode* root);
     37    ElementChildIterator(const ContainerNode* root, ElementType* current);
     38    ElementChildIterator& operator++();
    3939};
    4040
    4141template <typename ElementType>
    42 class ChildConstIterator : public ElementConstIterator<ElementType> {
     42class ElementChildConstIterator : public ElementConstIterator<ElementType> {
    4343public:
    44     ChildConstIterator(const ContainerNode* root);
    45     ChildConstIterator(const ContainerNode* root, const ElementType* current);
    46     ChildConstIterator& operator++();
     44    ElementChildConstIterator(const ContainerNode* root);
     45    ElementChildConstIterator(const ContainerNode* root, const ElementType* current);
     46    ElementChildConstIterator& operator++();
    4747};
    4848
    4949template <typename ElementType>
    50 class ChildIteratorAdapter {
     50class ElementChildIteratorAdapter {
    5151public:
    52     ChildIteratorAdapter(ContainerNode* root);
    53     ChildIterator<ElementType> begin();
    54     ChildIterator<ElementType> end();
     52    ElementChildIteratorAdapter(ContainerNode* root);
     53    ElementChildIterator<ElementType> begin();
     54    ElementChildIterator<ElementType> end();
    5555
    5656private:
    … …  
    5959
    6060template <typename ElementType>
    61 class ChildConstIteratorAdapter {
     61class ElementChildConstIteratorAdapter {
    6262public:
    63     ChildConstIteratorAdapter(const ContainerNode* root);
    64     ChildConstIterator<ElementType> begin() const;
    65     ChildConstIterator<ElementType> end() const;
     63    ElementChildConstIteratorAdapter(const ContainerNode* root);
     64    ElementChildConstIterator<ElementType> begin() const;
     65    ElementChildConstIterator<ElementType> end() const;
    6666
    6767private:
    … …  
    6969};
    7070
    71 ChildIteratorAdapter<Element> elementChildren(ContainerNode* root);
    72 ChildConstIteratorAdapter<Element> elementChildren(const ContainerNode* root);
    73 template <typename ElementType> ChildIteratorAdapter<ElementType> childrenOfType(ContainerNode* root);
    74 template <typename ElementType> ChildConstIteratorAdapter<ElementType> childrenOfType(const ContainerNode* root);
     71ElementChildIteratorAdapter<Element> elementChildren(ContainerNode* root);
     72ElementChildConstIteratorAdapter<Element> elementChildren(const ContainerNode* root);
     73template <typename ElementType> ElementChildIteratorAdapter<ElementType> childrenOfType(ContainerNode* root);
     74template <typename ElementType> ElementChildConstIteratorAdapter<ElementType> childrenOfType(const ContainerNode* root);
    7575
    76 // ChildIterator
     76// ElementChildIterator
    7777
    7878template <typename ElementType>
    79 inline ChildIterator<ElementType>::ChildIterator(const ContainerNode* root)
     79inline ElementChildIterator<ElementType>::ElementChildIterator(const ContainerNode* root)
    8080    : ElementIterator<ElementType>(root)
    8181{
    … …  
    8383
    8484template <typename ElementType>
    85 inline ChildIterator<ElementType>::ChildIterator(const ContainerNode* root, ElementType* current)
     85inline ElementChildIterator<ElementType>::ElementChildIterator(const ContainerNode* root, ElementType* current)
    8686    : ElementIterator<ElementType>(root, current)
    8787{
    … …  
    8989
    9090template <typename ElementType>
    91 inline ChildIterator<ElementType>& ChildIterator<ElementType>::operator++()
     91inline ElementChildIterator<ElementType>& ElementChildIterator<ElementType>::operator++()
    9292{
    93     return static_cast<ChildIterator<ElementType>&>(ElementIterator<ElementType>::traverseNextSibling());
     93    return static_cast<ElementChildIterator<ElementType>&>(ElementIterator<ElementType>::traverseNextSibling());
    9494}
    9595
    96 // ChildConstIterator
     96// ElementChildConstIterator
    9797
    9898template <typename ElementType>
    99 inline ChildConstIterator<ElementType>::ChildConstIterator(const ContainerNode* root)
     99inline ElementChildConstIterator<ElementType>::ElementChildConstIterator(const ContainerNode* root)
    100100    : ElementConstIterator<ElementType>(root)
    101101{
    … …  
    103103
    104104template <typename ElementType>
    105 inline ChildConstIterator<ElementType>::ChildConstIterator(const ContainerNode* root, const ElementType* current)
     105inline ElementChildConstIterator<ElementType>::ElementChildConstIterator(const ContainerNode* root, const ElementType* current)
    106106    : ElementConstIterator<ElementType>(root, current)
    107107{
    … …  
    109109
    110110template <typename ElementType>
    111 inline ChildConstIterator<ElementType>& ChildConstIterator<ElementType>::operator++()
     111inline ElementChildConstIterator<ElementType>& ElementChildConstIterator<ElementType>::operator++()
    112112{
    113     return static_cast<ChildConstIterator<ElementType>&>(ElementConstIterator<ElementType>::traverseNextSibling());
     113    return static_cast<ElementChildConstIterator<ElementType>&>(ElementConstIterator<ElementType>::traverseNextSibling());
    114114}
    115115
    116 // ChildIteratorAdapter
     116// ElementChildIteratorAdapter
    117117
    118118template <typename ElementType>
    119 inline ChildIteratorAdapter<ElementType>::ChildIteratorAdapter(ContainerNode* root)
     119inline ElementChildIteratorAdapter<ElementType>::ElementChildIteratorAdapter(ContainerNode* root)
    120120    : m_root(root)
    121121{
    … …  
    123123
    124124template <typename ElementType>
    125 inline ChildIterator<ElementType> ChildIteratorAdapter<ElementType>::begin()
     125inline ElementChildIterator<ElementType> ElementChildIteratorAdapter<ElementType>::begin()
    126126{
    127     return ChildIterator<ElementType>(m_root, Traversal<ElementType>::firstChild(m_root));
     127    return ElementChildIterator<ElementType>(m_root, Traversal<ElementType>::firstChild(m_root));
    128128}
    129129
    130130template <typename ElementType>
    131 inline ChildIterator<ElementType> ChildIteratorAdapter<ElementType>::end()
     131inline ElementChildIterator<ElementType> ElementChildIteratorAdapter<ElementType>::end()
    132132{
    133     return ChildIterator<ElementType>(m_root);
     133    return ElementChildIterator<ElementType>(m_root);
    134134}
    135135
    136 // ChildConstIteratorAdapter
     136// ElementChildConstIteratorAdapter
    137137
    138138template <typename ElementType>
    139 inline ChildConstIteratorAdapter<ElementType>::ChildConstIteratorAdapter(const ContainerNode* root)
     139inline ElementChildConstIteratorAdapter<ElementType>::ElementChildConstIteratorAdapter(const ContainerNode* root)
    140140    : m_root(root)
    141141{
    … …  
    143143
    144144template <typename ElementType>
    145 inline ChildConstIterator<ElementType> ChildConstIteratorAdapter<ElementType>::begin() const
     145inline ElementChildConstIterator<ElementType> ElementChildConstIteratorAdapter<ElementType>::begin() const
    146146{
    147     return ChildConstIterator<ElementType>(m_root, Traversal<ElementType>::firstChild(m_root));
     147    return ElementChildConstIterator<ElementType>(m_root, Traversal<ElementType>::firstChild(m_root));
    148148}
    149149
    150150template <typename ElementType>
    151 inline ChildConstIterator<ElementType> ChildConstIteratorAdapter<ElementType>::end() const
     151inline ElementChildConstIterator<ElementType> ElementChildConstIteratorAdapter<ElementType>::end() const
    152152{
    153     return ChildConstIterator<ElementType>(m_root);
     153    return ElementChildConstIterator<ElementType>(m_root);
    154154}
    155155
    156156// Standalone functions
    157157
    158 inline ChildIteratorAdapter<Element> elementChildren(ContainerNode* root)
     158inline ElementChildIteratorAdapter<Element> elementChildren(ContainerNode* root)
    159159{
    160     return ChildIteratorAdapter<Element>(root);
     160    return ElementChildIteratorAdapter<Element>(root);
    161161}
    162162
    163163template <typename ElementType>
    164 inline ChildIteratorAdapter<ElementType> childrenOfType(ContainerNode* root)
     164inline ElementChildIteratorAdapter<ElementType> childrenOfType(ContainerNode* root)
    165165{
    166     return ChildIteratorAdapter<ElementType>(root);
     166    return ElementChildIteratorAdapter<ElementType>(root);
    167167}
    168168
    169 inline ChildConstIteratorAdapter<Element> elementChildren(const ContainerNode* root)
     169inline ElementChildConstIteratorAdapter<Element> elementChildren(const ContainerNode* root)
    170170{
    171     return ChildConstIteratorAdapter<Element>(root);
     171    return ElementChildConstIteratorAdapter<Element>(root);
    172172}
    173173
    174174template <typename ElementType>
    175 inline ChildConstIteratorAdapter<ElementType> childrenOfType(const ContainerNode* root)
     175inline ElementChildConstIteratorAdapter<ElementType> childrenOfType(const ContainerNode* root)
    176176{
    177     return ChildConstIteratorAdapter<ElementType>(root);
     177    return ElementChildConstIteratorAdapter<ElementType>(root);
    178178}
    179179

  • trunk/Source/WebCore/dom/ElementDescendantIterator.h

    r154926 r154928  
    2424 */
    2525
    26 #ifndef DescendantIterator_h
    27 #define DescendantIterator_h
     26#ifndef ElementDescendantIterator_h
     27#define ElementDescendantIterator_h
    2828
    2929#include "ElementIterator.h"
    … …  
    3232
    3333template <typename ElementType>
    34 class DescendantIterator : public ElementIterator<ElementType> {
     34class ElementDescendantIterator : public ElementIterator<ElementType> {
    3535public:
    36     DescendantIterator(const ContainerNode* root);
    37     DescendantIterator(const ContainerNode* root, ElementType* current);
    38     DescendantIterator& operator++();
     36    ElementDescendantIterator(const ContainerNode* root);
     37    ElementDescendantIterator(const ContainerNode* root, ElementType* current);
     38    ElementDescendantIterator& operator++();
    3939};
    4040
    4141template <typename ElementType>
    42 class DescendantConstIterator : public ElementConstIterator<ElementType>  {
     42class ElementDescendantConstIterator : public ElementConstIterator<ElementType>  {
    4343public:
    44     DescendantConstIterator(const ContainerNode* root);
    45     DescendantConstIterator(const ContainerNode* root, const ElementType* current);
    46     DescendantConstIterator& operator++();
     44    ElementDescendantConstIterator(const ContainerNode* root);
     45    ElementDescendantConstIterator(const ContainerNode* root, const ElementType* current);
     46    ElementDescendantConstIterator& operator++();
    4747};
    4848
    4949template <typename ElementType>
    50 class DescendantIteratorAdapter {
     50class ElementDescendantIteratorAdapter {
    5151public:
    52     DescendantIteratorAdapter(ContainerNode* root);
    53     DescendantIterator<ElementType> begin();
    54     DescendantIterator<ElementType> end();
     52    ElementDescendantIteratorAdapter(ContainerNode* root);
     53    ElementDescendantIterator<ElementType> begin();
     54    ElementDescendantIterator<ElementType> end();
    5555
    5656private:
    … …  
    5959
    6060template <typename ElementType>
    61 class DescendantConstIteratorAdapter {
     61class ElementDescendantConstIteratorAdapter {
    6262public:
    63     DescendantConstIteratorAdapter(const ContainerNode* root);
    64     DescendantConstIterator<ElementType> begin() const;
    65     DescendantConstIterator<ElementType> end() const;
     63    ElementDescendantConstIteratorAdapter(const ContainerNode* root);
     64    ElementDescendantConstIterator<ElementType> begin() const;
     65    ElementDescendantConstIterator<ElementType> end() const;
    6666
    6767private:
    … …  
    6969};
    7070
    71 DescendantIteratorAdapter<Element> elementDescendants(ContainerNode* root);
    72 DescendantConstIteratorAdapter<Element> elementDescendants(const ContainerNode* root);
    73 template <typename ElementType> DescendantIteratorAdapter<ElementType> descendantsOfType(ContainerNode* root);
    74 template <typename ElementType> DescendantConstIteratorAdapter<ElementType> descendantsOfType(const ContainerNode* root);
     71ElementDescendantIteratorAdapter<Element> elementDescendants(ContainerNode* root);
     72ElementDescendantConstIteratorAdapter<Element> elementDescendants(const ContainerNode* root);
     73template <typename ElementType> ElementDescendantIteratorAdapter<ElementType> descendantsOfType(ContainerNode* root);
     74template <typename ElementType> ElementDescendantConstIteratorAdapter<ElementType> descendantsOfType(const ContainerNode* root);
    7575
    76 // DescendantIterator
     76// ElementDescendantIterator
    7777
    7878template <typename ElementType>
    79 inline DescendantIterator<ElementType>::DescendantIterator(const ContainerNode* root)
     79inline ElementDescendantIterator<ElementType>::ElementDescendantIterator(const ContainerNode* root)
    8080    : ElementIterator<ElementType>(root)
    8181{
    … …  
    8383
    8484template <typename ElementType>
    85 inline DescendantIterator<ElementType>::DescendantIterator(const ContainerNode* root, ElementType* current)
     85inline ElementDescendantIterator<ElementType>::ElementDescendantIterator(const ContainerNode* root, ElementType* current)
    8686    : ElementIterator<ElementType>(root, current)
    8787{
    … …  
    8989
    9090template <typename ElementType>
    91 inline DescendantIterator<ElementType>& DescendantIterator<ElementType>::operator++()
     91inline ElementDescendantIterator<ElementType>& ElementDescendantIterator<ElementType>::operator++()
    9292{
    93     return static_cast<DescendantIterator<ElementType>&>(ElementIterator<ElementType>::traverseNext());
     93    return static_cast<ElementDescendantIterator<ElementType>&>(ElementIterator<ElementType>::traverseNext());
    9494}
    9595
    96 // DescendantConstIterator
     96// ElementDescendantConstIterator
    9797
    9898template <typename ElementType>
    99 inline DescendantConstIterator<ElementType>::DescendantConstIterator(const ContainerNode* root)
     99inline ElementDescendantConstIterator<ElementType>::ElementDescendantConstIterator(const ContainerNode* root)
    100100    : ElementConstIterator<ElementType>(root)
    101101
    … …  
    104104
    105105template <typename ElementType>
    106 inline DescendantConstIterator<ElementType>::DescendantConstIterator(const ContainerNode* root, const ElementType* current)
     106inline ElementDescendantConstIterator<ElementType>::ElementDescendantConstIterator(const ContainerNode* root, const ElementType* current)
    107107    : ElementConstIterator<ElementType>(root, current)
    108108{
    … …  
    110110
    111111template <typename ElementType>
    112 inline DescendantConstIterator<ElementType>& DescendantConstIterator<ElementType>::operator++()
     112inline ElementDescendantConstIterator<ElementType>& ElementDescendantConstIterator<ElementType>::operator++()
    113113{
    114     return static_cast<DescendantConstIterator<ElementType>&>(ElementConstIterator<ElementType>::traverseNext());
     114    return static_cast<ElementDescendantConstIterator<ElementType>&>(ElementConstIterator<ElementType>::traverseNext());
    115115}
    116116
    117 // DescendantIteratorAdapter
     117// ElementDescendantIteratorAdapter
    118118
    119119template <typename ElementType>
    120 inline DescendantIteratorAdapter<ElementType>::DescendantIteratorAdapter(ContainerNode* root)
     120inline ElementDescendantIteratorAdapter<ElementType>::ElementDescendantIteratorAdapter(ContainerNode* root)
    121121    : m_root(root)
    122122{
    … …  
    124124
    125125template <typename ElementType>
    126 inline DescendantIterator<ElementType> DescendantIteratorAdapter<ElementType>::begin()
     126inline ElementDescendantIterator<ElementType> ElementDescendantIteratorAdapter<ElementType>::begin()
    127127{
    128     return DescendantIterator<ElementType>(m_root, Traversal<ElementType>::firstWithin(m_root));
     128    return ElementDescendantIterator<ElementType>(m_root, Traversal<ElementType>::firstWithin(m_root));
    129129}
    130130
    131131template <typename ElementType>
    132 inline DescendantIterator<ElementType> DescendantIteratorAdapter<ElementType>::end()
     132inline ElementDescendantIterator<ElementType> ElementDescendantIteratorAdapter<ElementType>::end()
    133133{
    134     return DescendantIterator<ElementType>(m_root);
     134    return ElementDescendantIterator<ElementType>(m_root);
    135135}
    136136
    137 // DescendantConstIteratorAdapter
     137// ElementDescendantConstIteratorAdapter
    138138
    139139template <typename ElementType>
    140 inline DescendantConstIteratorAdapter<ElementType>::DescendantConstIteratorAdapter(const ContainerNode* root)
     140inline ElementDescendantConstIteratorAdapter<ElementType>::ElementDescendantConstIteratorAdapter(const ContainerNode* root)
    141141    : m_root(root)
    142142{
    … …  
    144144
    145145template <typename ElementType>
    146 inline DescendantConstIterator<ElementType> DescendantConstIteratorAdapter<ElementType>::begin() const
     146inline ElementDescendantConstIterator<ElementType> ElementDescendantConstIteratorAdapter<ElementType>::begin() const
    147147{
    148     return DescendantConstIterator<ElementType>(m_root, Traversal<ElementType>::firstWithin(m_root));
     148    return ElementDescendantConstIterator<ElementType>(m_root, Traversal<ElementType>::firstWithin(m_root));
    149149}
    150150
    151151template <typename ElementType>
    152 inline DescendantConstIterator<ElementType> DescendantConstIteratorAdapter<ElementType>::end() const
     152inline ElementDescendantConstIterator<ElementType> ElementDescendantConstIteratorAdapter<ElementType>::end() const
    153153{
    154     return DescendantConstIterator<ElementType>(m_root);
     154    return ElementDescendantConstIterator<ElementType>(m_root);
    155155}
    156156
    157157// Standalone functions
    158158
    159 inline DescendantIteratorAdapter<Element> elementDescendants(ContainerNode* root)
     159inline ElementDescendantIteratorAdapter<Element> elementDescendants(ContainerNode* root)
    160160{
    161     return DescendantIteratorAdapter<Element>(root);
     161    return ElementDescendantIteratorAdapter<Element>(root);
    162162}
    163163
    164164template <typename ElementType>
    165 inline DescendantIteratorAdapter<ElementType> descendantsOfType(ContainerNode* root)
     165inline ElementDescendantIteratorAdapter<ElementType> descendantsOfType(ContainerNode* root)
    166166{
    167     return DescendantIteratorAdapter<ElementType>(root);
     167    return ElementDescendantIteratorAdapter<ElementType>(root);
    168168}
    169169
    170 inline DescendantConstIteratorAdapter<Element> elementDescendants(const ContainerNode* root)
     170inline ElementDescendantConstIteratorAdapter<Element> elementDescendants(const ContainerNode* root)
    171171{
    172     return DescendantConstIteratorAdapter<Element>(root);
     172    return ElementDescendantConstIteratorAdapter<Element>(root);
    173173}
    174174
    175175template <typename ElementType>
    176 inline DescendantConstIteratorAdapter<ElementType> descendantsOfType(const ContainerNode* root)
     176inline ElementDescendantConstIteratorAdapter<ElementType> descendantsOfType(const ContainerNode* root)
    177177{
    178     return DescendantConstIteratorAdapter<ElementType>(root);
     178    return ElementDescendantConstIteratorAdapter<ElementType>(root);
    179179}
    180180

  • trunk/Source/WebCore/dom/ElementIterator.h

    r154926 r154928  
    285285}
    286286
    287 #endif
     287#include "ElementChildIterator.h"
     288#include "ElementDescendantIterator.h"
     289
     290#endif

  • trunk/Source/WebCore/dom/Node.cpp

    r154877 r154928  
    4545#include "DOMImplementation.h"
    4646#include "DOMSettableTokenList.h"
    47 #include "DescendantIterator.h"
    4847#include "Document.h"
    4948#include "DocumentFragment.h"
    5049#include "DocumentType.h"
    5150#include "Element.h"
     51#include "ElementIterator.h"
    5252#include "ElementRareData.h"
    5353#include "Event.h"

  • trunk/Source/WebCore/dom/TreeScope.cpp

    r154877 r154928  
    3131#include "DOMSelection.h"
    3232#include "DOMWindow.h"
    33 #include "DescendantIterator.h"
    3433#include "Document.h"
    3534#include "Element.h"
     35#include "ElementIterator.h"
    3636#include "FocusController.h"
    3737#include "Frame.h"

  • trunk/Source/WebCore/editing/ApplyStyleCommand.cpp

    r154877 r154928  
    3232#include "CSSValueKeywords.h"
    3333#include "CSSValuePool.h"
    34 #include "ChildIterator.h"
    3534#include "Document.h"
    3635#include "EditingStyle.h"
    3736#include "Editor.h"
     37#include "ElementIterator.h"
    3838#include "Frame.h"
    3939#include "HTMLFontElement.h"

  • trunk/Source/WebCore/editing/markup.cpp

    r154877 r154928  
    3737#include "ChildListMutationScope.h"
    3838#include "ContextFeatures.h"
    39 #include "DescendantIterator.h"
    4039#include "DocumentFragment.h"
    4140#include "DocumentType.h"
    4241#include "Editor.h"
     42#include "ElementIterator.h"
    4343#include "ExceptionCode.h"
    4444#include "ExceptionCodePlaceholder.h"

  • trunk/Source/WebCore/html/HTMLAppletElement.cpp

    r154877 r154928  
    2525#include "HTMLAppletElement.h"
    2626
    27 #include "ChildIterator.h"
     27#include "ElementIterator.h"
    2828#include "Frame.h"
    2929#include "FrameLoader.h"

  • trunk/Source/WebCore/html/HTMLFieldSetElement.cpp

    r154877 r154928  
    2626#include "HTMLFieldSetElement.h"
    2727
    28 #include "ChildIterator.h"
    29 #include "DescendantIterator.h"
     28#include "ElementIterator.h"
    3029#include "HTMLCollection.h"
    3130#include "HTMLLegendElement.h"

  • trunk/Source/WebCore/html/HTMLLabelElement.cpp

    r154877 r154928  
    2626#include "HTMLLabelElement.h"
    2727
    28 #include "DescendantIterator.h"
    2928#include "Document.h"
     29#include "ElementIterator.h"
    3030#include "Event.h"
    3131#include "EventNames.h"

  • trunk/Source/WebCore/html/HTMLMapElement.cpp

    r154877 r154928  
    2424
    2525#include "Attribute.h"
    26 #include "DescendantIterator.h"
    2726#include "Document.h"
     27#include "ElementIterator.h"
    2828#include "HTMLAreaElement.h"
    2929#include "HTMLCollection.h"

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r154908 r154928  
    3131#include "ApplicationCacheResource.h"
    3232#include "Attribute.h"
    33 #include "ChildIterator.h"
    3433#include "Chrome.h"
    3534#include "ChromeClient.h"
    … …  
    4039#include "CSSPropertyNames.h"
    4140#include "CSSValueKeywords.h"
    42 #include "DescendantIterator.h"
    4341#include "DiagnosticLoggingKeys.h"
    4442#include "DocumentLoader.h"
     43#include "ElementIterator.h"
    4544#include "Event.h"
    4645#include "EventNames.h"

  • trunk/Source/WebCore/html/HTMLObjectElement.cpp

    r154903 r154928  
    2828#include "CSSValueKeywords.h"
    2929#include "CachedImage.h"
    30 #include "ChildIterator.h"
    3130#include "Chrome.h"
    3231#include "ChromeClient.h"
     32#include "ElementIterator.h"
    3333#include "EventNames.h"
    3434#include "ExceptionCode.h"

  • trunk/Source/WebCore/loader/PlaceholderDocument.cpp

    r154903 r154928  
    2727#include "PlaceholderDocument.h"
    2828
    29 #include "ChildIterator.h"
     29#include "ElementIterator.h"
    3030
    3131namespace WebCore {

  • trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp

    r154679 r154928  
    3030#include "FilterEffectRenderer.h"
    3131
    32 #include "ChildIterator.h"
    3332#include "ColorSpace.h"
    3433#include "Document.h"
     34#include "ElementIterator.h"
    3535#include "FEColorMatrix.h"
    3636#include "FEComponentTransfer.h"

  • trunk/Source/WebCore/style/StyleResolveTree.cpp

    r154903 r154928  
    2828
    2929#include "AXObjectCache.h"
    30 #include "ChildIterator.h"
    3130#include "Element.h"
     31#include "ElementIterator.h"
    3232#include "ElementRareData.h"
    3333#include "ElementTraversal.h"

  • trunk/Source/WebCore/svg/SVGElement.cpp

    r154877 r154928  
    3232#include "CSSParser.h"
    3333#include "DOMImplementation.h"
    34 #include "DescendantIterator.h"
    3534#include "Document.h"
     35#include "ElementIterator.h"
    3636#include "Event.h"
    3737#include "EventNames.h"

  • trunk/Source/WebCore/svg/SVGSVGElement.cpp

    r154877 r154928  
    2828#include "Attribute.h"
    2929#include "CSSHelper.h"
    30 #include "DescendantIterator.h"
    3130#include "Document.h"
     31#include "ElementIterator.h"
    3232#include "EventListener.h"
    3333#include "EventNames.h"

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

    r154706 r154928  
    2828
    2929#if ENABLE(SVG)
    30 #include "DescendantIterator.h"
    3130#include "Document.h"
     31#include "ElementIterator.h"
    3232#include "SVGNames.h"
    3333#include "SVGSMILElement.h"

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

    r154877 r154928  
    3232
    3333#include "Chrome.h"
    34 #include "DescendantIterator.h"
    3534#include "DocumentLoader.h"
     35#include "ElementIterator.h"
    3636#include "FrameView.h"
    3737#include "ImageBuffer.h"
Note: See TracChangeset for help on using the changeset viewer.