Changeset 258843 in webkit


Ignore:
Timestamp:
Mar 23, 2020 8:25:39 AM (4 years ago)
Author:
Alan Bujtas
Message:

[LFC] Remove unused LayoutAncestorIterator class
​https://bugs.webkit.org/show_bug.cgi?id=209401
<rdar://problem/60743144>

Reviewed by Sam Weinig.

  • WebCore.xcodeproj/project.pbxproj:
  • layout/blockformatting/BlockFormattingContextGeometry.cpp:
  • layout/displaytree/DisplayPainter.cpp:
  • layout/layouttree/LayoutAncestorIterator.h: Removed.
  • layout/layouttree/LayoutChildIterator.h:

(WebCore::Layout::LayoutChildIteratorAdapter<T>::last const): Deleted.

  • layout/layouttree/LayoutIterator.h:

(WebCore::Layout::LayoutBoxTraversal::nextSkippingChildren): Deleted.
(WebCore::Layout::Traversal::lastChild): Deleted.
(WebCore::Layout::Traversal::previousSibling): Deleted.
(WebCore::Layout::Traversal::findAncestorOfType): Deleted.
(WebCore::Layout::LayoutIterator<T>::traversePreviousSibling): Deleted.
(WebCore::Layout::LayoutIterator<T>::traverseAncestor): Deleted.

  • layout/layouttree/LayoutTreeBuilder.cpp:
Location:
trunk/Source/WebCore
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r258842 r258843  
     12020-03-23  Zalan Bujtas  <zalan@apple.com>
     2
     3        [LFC] Remove unused LayoutAncestorIterator class
     4        https://bugs.webkit.org/show_bug.cgi?id=209401
     5        <rdar://problem/60743144>
     6
     7        Reviewed by Sam Weinig.
     8
     9        * WebCore.xcodeproj/project.pbxproj:
     10        * layout/blockformatting/BlockFormattingContextGeometry.cpp:
     11        * layout/displaytree/DisplayPainter.cpp:
     12        * layout/layouttree/LayoutAncestorIterator.h: Removed.
     13        * layout/layouttree/LayoutChildIterator.h:
     14        (WebCore::Layout::LayoutChildIteratorAdapter<T>::last const): Deleted.
     15        * layout/layouttree/LayoutIterator.h:
     16        (WebCore::Layout::LayoutBoxTraversal::nextSkippingChildren): Deleted.
     17        (WebCore::Layout::Traversal::lastChild): Deleted.
     18        (WebCore::Layout::Traversal::previousSibling): Deleted.
     19        (WebCore::Layout::Traversal::findAncestorOfType): Deleted.
     20        (WebCore::Layout::LayoutIterator<T>::traversePreviousSibling): Deleted.
     21        (WebCore::Layout::LayoutIterator<T>::traverseAncestor): Deleted.
     22        * layout/layouttree/LayoutTreeBuilder.cpp:
     23
    1242020-03-23  Antoine Quint  <graouts@apple.com>
    225

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

    r258820 r258843  
    381381                11310CF520BA4A4C0065A8D0 /* LayoutDescendantIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = 11B042FB20B0E21400828A6B /* LayoutDescendantIterator.h */; settings = {ATTRIBUTES = (Private, ); }; };
    382382                11310CF620BA4A560065A8D0 /* LayoutChildIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = 11100FC920927CBC0081AA6C /* LayoutChildIterator.h */; settings = {ATTRIBUTES = (Private, ); }; };
    383                 11310CF720BA4A620065A8D0 /* LayoutAncestorIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = 11100FCA2092868D0081AA6C /* LayoutAncestorIterator.h */; settings = {ATTRIBUTES = (Private, ); }; };
    384383                113409DA203E038000C66915 /* RenderTreeBuilderContinuation.h in Headers */ = {isa = PBXBuildFile; fileRef = 113409D8203E038000C66915 /* RenderTreeBuilderContinuation.h */; };
    385384                113D0B521F9FDD2B00F611BB /* FrameViewLayoutContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 113D0B501F9FDD2B00F611BB /* FrameViewLayoutContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    59935992                11100FC72092764C0081AA6C /* LayoutIterator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LayoutIterator.h; sourceTree = "<group>"; };
    59945993                11100FC920927CBC0081AA6C /* LayoutChildIterator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LayoutChildIterator.h; sourceTree = "<group>"; };
    5995                 11100FCA2092868D0081AA6C /* LayoutAncestorIterator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LayoutAncestorIterator.h; sourceTree = "<group>"; };
    59965994                11100FD5209514DE0081AA6C /* LayoutTreeBuilder.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutTreeBuilder.cpp; sourceTree = "<group>"; };
    59975995                11100FD7209514DF0081AA6C /* LayoutTreeBuilder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LayoutTreeBuilder.h; sourceTree = "<group>"; };
    … …  
    1695516953                        isa = PBXGroup;
    1695616954                        children = (
    16957                                 11100FCA2092868D0081AA6C /* LayoutAncestorIterator.h */,
    1695816955                                115CFA96208B952B001E6991 /* LayoutBox.cpp */,
    1695916956                                115CFA95208B952B001E6991 /* LayoutBox.h */,
    … …  
    3167731674                                580371641A66F1D300BAF519 /* LayerFragment.h in Headers */,
    3167831675                                7AA3A6A0194B59B6001CBD24 /* LayerPool.h in Headers */,
    31679                                 11310CF720BA4A620065A8D0 /* LayoutAncestorIterator.h in Headers */,
    3168031676                                115CFA97208B952B001E6991 /* LayoutBox.h in Headers */,
    3168131677                                11310CF620BA4A560065A8D0 /* LayoutChildIterator.h in Headers */,

  • trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp

    r258819 r258843  
    3333#include "FormattingContext.h"
    3434#include "InlineFormattingState.h"
    35 #include "LayoutChildIterator.h"
    3635#include "LayoutContext.h"
    3736#include "LayoutReplacedBox.h"

  • trunk/Source/WebCore/layout/displaytree/DisplayPainter.cpp

    r258819 r258843  
    3737#include "IntRect.h"
    3838#include "LayoutContainerBox.h"
    39 #include "LayoutDescendantIterator.h"
    4039#include "LayoutState.h"
    4140#include "RenderStyle.h"

  • trunk/Source/WebCore/layout/layouttree/LayoutChildIterator.h

    r256417 r258843  
    103103
    104104template <typename T>
    105 inline const T* LayoutChildIteratorAdapter<T>::last() const
    106 {
    107     return Traversal::lastChild<T>(m_parent);
    108 }
    109 
    110 template <typename T>
    111105inline LayoutChildIteratorAdapter<T> childrenOfType(const ContainerBox& parent)
    112106{

  • trunk/Source/WebCore/layout/layouttree/LayoutIterator.h

    r256417 r258843  
    4545    LayoutIterator& traverseNext();
    4646    LayoutIterator& traverseNextSibling();
    47     LayoutIterator& traversePreviousSibling();
    48     LayoutIterator& traverseAncestor();
    4947
    5048private:
    … …  
    9896}
    9997
    100 inline const Box* nextSkippingChildren(Box& current, const ContainerBox* stayWithin)
    101 {
    102     if (&current == stayWithin)
    103         return nullptr;
    104 
    105     if (auto* sibling = current.nextSibling())
    106         return sibling;
    107 
    108     return nextAncestorSibling(current, stayWithin);
    109 }
    110 
    11198}
    11299// Traversal helpers
    … …  
    122109}
    123110
    124 template <typename T, typename U>
    125 inline const T* lastChild(U& current)
    126 {
    127     auto* object = current.lastChild();
    128     while (object && !isLayoutBoxOfType<T>(*object))
    129         object = object->previousSibling();
    130     return static_cast<const T*>(object);
    131 }
    132 
    133111template <typename T>
    134112inline const T* nextSibling(const T& current)
    … …  
    141119
    142120template <typename T, typename U>
    143 inline const T* previousSibling(const T& current)
    144 {
    145     auto* object = current.previousSibling();
    146     while (object && !isLayoutBoxOfType<T>(*object))
    147         object = object->previousSibling();
    148     return static_cast<const T*>(object);
    149 }
    150 
    151 template <typename T, typename U>
    152 inline const T* findAncestorOfType(const T& current)
    153 {
    154     for (auto* ancestor = current.parent(); ancestor; ancestor = ancestor->parent()) {
    155         if (isLayoutBoxOfType<T>(*ancestor))
    156             return static_cast<const T*>(ancestor);
    157     }
    158     return nullptr;
    159 }
    160 
    161 template <typename T, typename U>
    162121inline const T* firstWithin(const U& stayWithin)
    163122{
    … …  
    212171
    213172template <typename T>
    214 inline LayoutIterator<T>& LayoutIterator<T>::traversePreviousSibling()
    215 {
    216     ASSERT(m_current);
    217     m_current = Traversal::previousSibling<T>(*m_current);
    218     return *this;
    219 }
    220 
    221 template <typename T>
    222 inline LayoutIterator<T>& LayoutIterator<T>::traverseAncestor()
    223 {
    224     ASSERT(m_current);
    225     ASSERT(m_current != m_root);
    226     m_current = Traversal::findAncestorOfType<T>(*m_current);
    227     return *this;
    228 }
    229 
    230 template <typename T>
    231173inline const T& LayoutIterator<T>::operator*() const
    232174{
    … …  
    257199}
    258200}
    259 #include "LayoutAncestorIterator.h"
    260201#include "LayoutChildIterator.h"
    261202

  • trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp

    r258820 r258843  
    4242#include "LayoutContainerBox.h"
    4343#include "LayoutContext.h"
    44 #include "LayoutDescendantIterator.h"
    4544#include "LayoutInitialContainingBlock.h"
    4645#include "LayoutInlineTextBox.h"
Note: See TracChangeset for help on using the changeset viewer.