Skip to content

Commit

Permalink
Remove isCharacterData() in favor of isCharacterDataNode()
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=268444

Reviewed by Alexey Shvayka.

The latter is more widespread and seems like a reasonable enough name
given the other type getter names.

* Source/WebCore/dom/CharacterData.h:
* Source/WebCore/dom/Node.h:
(WebCore::Node::isCharacterDataNode const):
(WebCore::Node::isAttributeNode const):
(WebCore::Node::isCharacterData const): Deleted.
* Source/WebCore/dom/Position.h:
(WebCore::firstPositionInNode):
(WebCore::lastPositionInNode):

Canonical link: https://commits.webkit.org/273826@main
  • Loading branch information
annevk committed Jan 31, 2024
1 parent 5495e9f commit 33669e3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Source/WebCore/dom/CharacterData.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class CharacterData : public Node {
: Node(document, type, typeFlags | TypeFlag::IsCharacterData)
, m_data(!text.isNull() ? WTFMove(text) : emptyString())
{
ASSERT(isCharacterData());
ASSERT(isCharacterDataNode());
ASSERT(!isContainerNode());
}

Expand Down
3 changes: 1 addition & 2 deletions Source/WebCore/dom/Node.h
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ class Node : public EventTarget {

bool isElementNode() const { return hasTypeFlag(TypeFlag::IsElement); }
bool isContainerNode() const { return hasTypeFlag(TypeFlag::IsContainerNode); }
bool isCharacterData() const { return hasTypeFlag(TypeFlag::IsCharacterData); }
bool isCharacterDataNode() const { return hasTypeFlag(TypeFlag::IsCharacterData); }
bool isTextNode() const { return hasTypeFlag(TypeFlag::IsText); }
bool isHTMLElement() const { return hasTypeFlag(TypeFlag::IsHTMLElement); }
bool isSVGElement() const { return hasTypeFlag(TypeFlag::IsSVGElement); }
Expand All @@ -238,7 +238,6 @@ class Node : public EventTarget {
#endif
bool isStyledElement() const { return hasTypeFlag(TypeFlag::IsHTMLElement) || hasTypeFlag(TypeFlag::IsSVGElement) || hasTypeFlag(TypeFlag::IsMathMLElement); }
virtual bool isAttributeNode() const { return false; }
bool isCharacterDataNode() const { return hasTypeFlag(TypeFlag::IsCharacterData); }
virtual bool isFrameOwnerElement() const { return false; }
virtual bool isPluginElement() const { return false; }

Expand Down
4 changes: 2 additions & 2 deletions Source/WebCore/dom/Position.h
Original file line number Diff line number Diff line change
Expand Up @@ -317,14 +317,14 @@ inline Position positionAfterNode(Node* anchorNode)
// firstPositionInNode and lastPositionInNode return parent-anchored positions, lastPositionInNode construction is O(n) due to countChildNodes()
inline Position firstPositionInNode(Node* anchorNode)
{
if (anchorNode->isCharacterData())
if (anchorNode->isCharacterDataNode())
return Position(anchorNode, 0, Position::PositionIsOffsetInAnchor);
return Position(anchorNode, Position::PositionIsBeforeChildren);
}

inline Position lastPositionInNode(Node* anchorNode)
{
if (anchorNode->isCharacterData())
if (anchorNode->isCharacterDataNode())
return Position(anchorNode, anchorNode->length(), Position::PositionIsOffsetInAnchor);
return Position(anchorNode, Position::PositionIsAfterChildren);
}
Expand Down

0 comments on commit 33669e3

Please sign in to comment.