Changeset 150702 in webkit

Timestamp:

May 25, 2013 8:29:12 PM (11 years ago)

Author:

akling@apple.com

Message:

Don't instantiate ChildNodeLists just to get a child count.
<​http://webkit.org/b/116776>

Reviewed by Ryosuke Niwa.

Use ContainerNode::childNodeCount() instead of Node::childNodes()->length().

• editing/ApplyStyleCommand.cpp:

(WebCore::ApplyStyleCommand::mergeEndWithNextIfIdentical):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/ApplyStyleCommand.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-25  Andreas Kling  <akling@apple.com>
+
+        Don't instantiate ChildNodeLists just to get a child count.
+        <http://webkit.org/b/116776>
+
+        Reviewed by Ryosuke Niwa.
+
+        Use ContainerNode::childNodeCount() instead of Node::childNodes()->length().
+
+        * editing/ApplyStyleCommand.cpp:
+        (WebCore::ApplyStyleCommand::mergeEndWithNextIfIdentical):
+
 2013-05-25  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/editing/ApplyStyleCommand.cpp

@@ -1305 +1305 @@
             return false;
 
-        unsigned parentLastOffset = end.deprecatedNode()->parentNode()->childNodes()->length() - 1;
+        unsigned parentLastOffset = end.deprecatedNode()->parentNode()->childNodeCount() - 1;
         if (end.deprecatedNode()->nextSibling())
             return false;
@@ -1325 +1325 @@
 
         bool shouldUpdateStart = start.containerNode() == endNode;
-        int endOffset = nextChild ? nextChild->nodeIndex() : nextElement->childNodes()->length();
+        int endOffset = nextChild ? nextChild->nodeIndex() : nextElement->childNodeCount();
         updateStartEnd(shouldUpdateStart ? Position(nextElement, start.offsetInContainerNode(), Position::PositionIsOffsetInAnchor) : start,
                        Position(nextElement, endOffset, Position::PositionIsOffsetInAnchor));