Change isBlock and isInline functions to check for isElementNode
Simple refactoring to add isElementNode check in isBlock and isInline functions.
Also removed isElementNode check from enclosingBlock.
Webkit bug pointing the same - https://bugs.webkit.org/show_bug.cgi?id=86106
TEST=Refactoring, no behavior change.
Review URL: https://codereview.chromium.org/98723009
git-svn-id: svn://svn.chromium.org/blink/trunk@163285 bbb929c8-8fbe-4397-9dbb-9b2b20218538
diff --git a/Source/core/editing/htmlediting.cpp b/Source/core/editing/htmlediting.cpp
index 7a5c5cf..6c00bb5 100644
--- a/Source/core/editing/htmlediting.cpp
+++ b/Source/core/editing/htmlediting.cpp
@@ -310,12 +310,12 @@
// Whether or not content before and after this node will collapse onto the same line as it.
bool isBlock(const Node* node)
{
- return node && node->renderer() && !node->renderer()->isInline() && !node->renderer()->isRubyText();
+ return node && node->isElementNode() && node->renderer() && !node->renderer()->isInline() && !node->renderer()->isRubyText();
}
bool isInline(const Node* node)
{
- return node && node->renderer() && node->renderer()->isInline();
+ return node && node->isElementNode() && node->renderer() && node->renderer()->isInline();
}
// FIXME: Deploy this in all of the places where enclosingBlockFlow/enclosingBlockFlowOrTableElement are used.
@@ -325,7 +325,7 @@
Element* enclosingBlock(Node* node, EditingBoundaryCrossingRule rule)
{
Node* enclosingNode = enclosingNodeOfType(firstPositionInOrBeforeNode(node), isBlock, rule);
- return enclosingNode && enclosingNode->isElementNode() ? toElement(enclosingNode) : 0;
+ return toElement(enclosingNode);
}
TextDirection directionOfEnclosingBlock(const Position& position)
