Changeset 48235 in webkit

Timestamp:

Sep 9, 2009, 4:25:53 PM (16 years ago)

Author:

eric@webkit.org

Message:

2009-07-30 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Add more position constructors
positionBeforeNode, positionAfterNode
firstPositionInNode, lastPositionInNode
​https://bugs.webkit.org/show_bug.cgi?id=25494

I also added a lastOffsetInNode and deployed it to a couple places.

There are no callers to these new constructors yet, but those
will be coming in future patches.

• dom/Position.cpp: (WebCore::Position::computeOffsetInContainerNode):
• dom/Position.h: (WebCore::positionBeforeNode): (WebCore::positionAfterNode): (WebCore::lastOffsetInNode): (WebCore::firstPositionInNode): (WebCore::lastPositionInNode):
• editing/ApplyStyleCommand.cpp:
• editing/TextIterator.cpp: (WebCore::SimplifiedBackwardsTextIterator::SimplifiedBackwardsTextIterator):
• editing/htmlediting.cpp: (WebCore::lastOffsetForEditing):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Position.cpp (modified) (1 diff)
• dom/Position.h (modified) (1 diff)
• editing/ApplyStyleCommand.cpp (modified) (1 diff)
• editing/TextIterator.cpp (modified) (2 diffs)
• editing/htmlediting.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ -1 +1 @@
 2009-07-30  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Add more position constructors
+        positionBeforeNode, positionAfterNode
+        firstPositionInNode, lastPositionInNode
+        https://bugs.webkit.org/show_bug.cgi?id=25494
+
+        I also added a lastOffsetInNode and deployed it to a couple places.
+
+        There are no callers to these new constructors yet, but those
+        will be coming in future patches.
+
+        * dom/Position.cpp:
+        (WebCore::Position::computeOffsetInContainerNode):
+        * dom/Position.h:
+        (WebCore::positionBeforeNode):
+        (WebCore::positionAfterNode):
+        (WebCore::lastOffsetInNode):
+        (WebCore::firstPositionInNode):
+        (WebCore::lastPositionInNode):
+        * editing/ApplyStyleCommand.cpp:
+        * editing/TextIterator.cpp:
+        (WebCore::SimplifiedBackwardsTextIterator::SimplifiedBackwardsTextIterator):
+        * editing/htmlediting.cpp:
+        (WebCore::lastOffsetForEditing):
+
+2009-04-30  Eric Seidel  <eric@webkit.org>
 
         Reviewed by Adam Barth.

trunk/WebCore/dom/Position.cpp

@@ -139 +139 @@
     switch (anchorType()) {
     case PositionIsOffsetInAnchor:
-    {
-        int maximumValidOffset = m_anchorNode->offsetInCharacters() ? m_anchorNode->maxCharacterOffset() : m_anchorNode->childNodeCount();
-        return std::min(maximumValidOffset, m_offset);
-    }
+        return std::min(lastOffsetInNode(m_anchorNode.get()), m_offset);
     case PositionIsBeforeAnchor:
         return m_anchorNode->nodeIndex();

trunk/WebCore/dom/Position.h

@@ -209 +209 @@
 }
 
+// positionBeforeNode and positionAfterNode return neighbor-anchored positions, construction is O(1)
+inline Position positionBeforeNode(Node* anchorNode)
+{
+    ASSERT(anchorNode);
+    return Position(anchorNode, Position::PositionIsBeforeAnchor);
+}
+
+inline Position positionAfterNode(Node* anchorNode)
+{
+    ASSERT(anchorNode);
+    return Position(anchorNode, Position::PositionIsAfterAnchor);
+}
+
+inline int lastOffsetInNode(Node* node)
+{
+    return node->offsetInCharacters() ? node->maxCharacterOffset() : node->childNodeCount();
+}
+
+// firstPositionInNode and lastPositionInNode return parent-anchored positions, lastPositionInNode construction is O(n) due to childNodeCount()
+inline Position firstPositionInNode(Node* anchorNode)
+{
+    return Position(anchorNode, 0, Position::PositionIsOffsetInAnchor);
+}
+
+inline Position lastPositionInNode(Node* anchorNode)
+{
+    return Position(anchorNode, lastOffsetInNode(anchorNode), Position::PositionIsOffsetInAnchor);
+}
+
 } // namespace WebCore
 

trunk/WebCore/editing/ApplyStyleCommand.cpp

@@ -1380 +1380 @@
 }
 
+// FIXME: Why does this exist?  Callers should either use lastOffsetForEditing or lastOffsetInNode
 static int maxRangeOffset(Node *n)
 {

trunk/WebCore/editing/TextIterator.cpp

@@ -34 +34 @@
 #include "htmlediting.h"
 #include "InlineTextBox.h"
-#include "Position.h"
 #include "Range.h"
 #include "RenderTableCell.h"
@@ -942 +941 @@
         if (endOffset > 0 && endOffset <= static_cast<int>(endNode->childNodeCount())) {
             endNode = endNode->childNode(endOffset - 1);
-            endOffset = endNode->offsetInCharacters() ? endNode->maxCharacterOffset() : endNode->childNodeCount();
+            endOffset = lastOffsetInNode(endNode);
         }
     }

trunk/WebCore/editing/htmlediting.cpp

@@ -385 +385 @@
     if (node->offsetInCharacters())
         return node->maxCharacterOffset();
-        
+
     if (node->hasChildNodes())
         return node->childNodeCount();
-    
+
     // NOTE: This should preempt the childNodeCount for, e.g., select nodes
     if (editingIgnoresContent(node))