Commit a9bb78d9 authored by Rune Lillesveen's avatar Rune Lillesveen Committed by Commit Bot

IsChildDirty() is no longer used in DCHECKs.

Remove the method as it is no longer used.

Change-Id: Ib5a18d1575ddce078157ed684af50fceb39278ac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1899861Reviewed-by: default avatarMorten Stenshorne <mstensho@chromium.org>
Commit-Queue: Rune Lillesveen <futhark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712961}
parent b4be739e
......@@ -38,10 +38,6 @@ Element& LayoutTreeRebuildRoot::RootElement() const {
ContainerNode* LayoutTreeRebuildRoot::Parent(const Node& node) const {
return node.GetReattachParent();
}
bool LayoutTreeRebuildRoot::IsChildDirty(const ContainerNode& node) const {
return node.ChildNeedsReattachLayoutTree();
}
#endif // DCHECK_IS_ON()
bool LayoutTreeRebuildRoot::IsDirty(const Node& node) const {
......
......@@ -18,7 +18,6 @@ class CORE_EXPORT LayoutTreeRebuildRoot : public StyleTraversalRoot {
private:
#if DCHECK_IS_ON()
ContainerNode* Parent(const Node& node) const final;
bool IsChildDirty(const ContainerNode& node) const final;
#endif // DCHECK_IS_ON()
bool IsDirty(const Node& node) const final;
void RootRemoved(ContainerNode& parent) final;
......
......@@ -23,10 +23,6 @@ Element* StyleInvalidationRoot::RootElement() const {
ContainerNode* StyleInvalidationRoot::Parent(const Node& node) const {
return node.ParentOrShadowHostNode();
}
bool StyleInvalidationRoot::IsChildDirty(const ContainerNode& node) const {
return node.ChildNeedsStyleInvalidation();
}
#endif // DCHECK_IS_ON()
bool StyleInvalidationRoot::IsDirty(const Node& node) const {
......
......@@ -18,7 +18,6 @@ class CORE_EXPORT StyleInvalidationRoot : public StyleTraversalRoot {
private:
#if DCHECK_IS_ON()
ContainerNode* Parent(const Node& node) const final;
bool IsChildDirty(const ContainerNode& node) const final;
#endif // DCHECK_IS_ON()
bool IsDirty(const Node& node) const final;
void RootRemoved(ContainerNode& parent) final;
......
......@@ -40,10 +40,6 @@ Element& StyleRecalcRoot::RootElement() const {
ContainerNode* StyleRecalcRoot::Parent(const Node& node) const {
return node.GetStyleRecalcParent();
}
bool StyleRecalcRoot::IsChildDirty(const ContainerNode& node) const {
return node.ChildNeedsStyleRecalc();
}
#endif // DCHECK_IS_ON()
bool StyleRecalcRoot::IsDirty(const Node& node) const {
......
......@@ -18,7 +18,6 @@ class CORE_EXPORT StyleRecalcRoot : public StyleTraversalRoot {
private:
#if DCHECK_IS_ON()
ContainerNode* Parent(const Node& node) const final;
bool IsChildDirty(const ContainerNode& node) const final;
#endif // DCHECK_IS_ON()
bool IsDirty(const Node& node) const final;
void RootRemoved(ContainerNode& parent) final;
......
......@@ -55,9 +55,6 @@ class CORE_EXPORT StyleTraversalRoot {
// Return the parent node for type of traversal for which the implementation
// is a root.
virtual ContainerNode* Parent(const Node&) const = 0;
// Return true if the given node has dirty descendants.
virtual bool IsChildDirty(const ContainerNode&) const = 0;
#endif // DCHECK_IS_ON()
// Return true if the given node is dirty.
......
......@@ -19,7 +19,6 @@ class StyleTraversalRootTestImpl : public StyleTraversalRoot {
public:
StyleTraversalRootTestImpl() = default;
void MarkDirty(const Node* node) { dirty_nodes_.insert(node); }
void MarkChildDirty(const Node* node) { child_dirty_nodes_.insert(node); }
bool IsSingleRoot() const { return root_type_ == RootType::kSingleRoot; }
bool IsCommonRoot() const { return root_type_ == RootType::kCommonRoot; }
......@@ -31,23 +30,15 @@ class StyleTraversalRootTestImpl : public StyleTraversalRoot {
ContainerNode* Parent(const Node& node) const override {
return ParentInternal(node);
}
bool IsChildDirty(const ContainerNode& node) const final {
return child_dirty_nodes_.Contains(&node);
}
#endif // DCHECK_IS_ON()
bool IsDirty(const Node& node) const final {
return dirty_nodes_.Contains(&node);
}
void RootRemoved(ContainerNode& parent) override {
for (ContainerNode* ancestor = &parent; ancestor;
ancestor = ParentInternal(*ancestor)) {
child_dirty_nodes_.erase(ancestor);
}
Clear();
}
HeapHashSet<Member<const Node>> dirty_nodes_;
mutable HeapHashSet<Member<const Node>> child_dirty_nodes_;
};
class StyleTraversalRootTest : public testing::Test {
......@@ -86,7 +77,6 @@ class StyleTraversalRootTest : public testing::Test {
TEST_F(StyleTraversalRootTest, Update_SingleRoot) {
StyleTraversalRootTestImpl root;
root.MarkChildDirty(&GetDocument());
root.MarkDirty(DivElement(kA));
// A single dirty node becomes a single root.
......@@ -97,8 +87,6 @@ TEST_F(StyleTraversalRootTest, Update_SingleRoot) {
TEST_F(StyleTraversalRootTest, Update_CommonRoot) {
StyleTraversalRootTestImpl root;
root.MarkChildDirty(&GetDocument());
root.MarkChildDirty(DivElement(kA));
root.MarkDirty(DivElement(kC));
// Initially make B a single root.
......@@ -116,14 +104,11 @@ TEST_F(StyleTraversalRootTest, Update_CommonRoot) {
TEST_F(StyleTraversalRootTest, Update_CommonRootDirtySubtree) {
StyleTraversalRootTestImpl root;
root.MarkChildDirty(&GetDocument());
root.MarkDirty(DivElement(kA));
root.Update(nullptr, DivElement(kA));
// Marking descendants of a single dirty root makes the single root a common
// root as long as the new common ancestor is the current root.
root.MarkChildDirty(DivElement(kA));
root.MarkChildDirty(DivElement(kB));
root.MarkDirty(DivElement(kD));
root.Update(DivElement(kA), DivElement(kD));
EXPECT_EQ(DivElement(kA), root.GetRootNode());
......@@ -135,9 +120,6 @@ TEST_F(StyleTraversalRootTest, Update_CommonRootDocumentFallback) {
StyleTraversalRootTestImpl root;
// Initially make B a common root for D and E.
root.MarkChildDirty(&GetDocument());
root.MarkChildDirty(DivElement(kA));
root.MarkChildDirty(DivElement(kB));
root.MarkDirty(DivElement(kD));
root.Update(nullptr, DivElement(kD));
root.MarkDirty(DivElement(kE));
......@@ -158,9 +140,6 @@ TEST_F(StyleTraversalRootTest, Update_CommonRootDocumentFallback) {
TEST_F(StyleTraversalRootTest, ChildrenRemoved) {
StyleTraversalRootTestImpl root;
// Initially make E a single root.
root.MarkChildDirty(&GetDocument());
root.MarkChildDirty(DivElement(kA));
root.MarkChildDirty(DivElement(kB));
root.MarkDirty(DivElement(kE));
root.Update(nullptr, DivElement(kE));
EXPECT_EQ(DivElement(kE), root.GetRootNode());
......@@ -191,8 +170,6 @@ TEST_F(StyleTraversalRootTest, Update_CommonRoot_FlatTree) {
StyleTraversalRootFlatTreeTestImpl root;
// The single dirty node D becomes a single root.
root.MarkChildDirty(DivElement(kA));
root.MarkChildDirty(DivElement(kB));
root.MarkDirty(DivElement(kD));
root.Update(nullptr, DivElement(kD));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment