Changeset 13244 in webkit

Timestamp:

Mar 9, 2006 6:20:26 PM (18 years ago)

Author:

adele

Message:

Reviewed by Tim O.

Removed unnecessary alerts in TextIterator advance methods.
We want to be able to use advance() even if the iterator is already at the end.

• editing/visible_text.cpp: (khtml::TextIterator::advance): remove assert since TextIterator will just do nothing if its already at the end. (khtml::CharacterIterator::advance): ditto.
• rendering/RenderTextField.cpp: (WebCore::RenderTextField::visiblePositionForIndex): Since the asserts in the iterator are removed, we don't have to check for it.atEnd() before calling advance.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/visible_text.cpp (modified) (2 diffs)
• rendering/RenderTextField.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-03-09  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Tim O.
+
+        Removed unnecessary alerts in TextIterator advance methods.  
+        We want to be able to use advance() even if the iterator is already at the end.
+
+        * editing/visible_text.cpp:
+        (khtml::TextIterator::advance): remove assert since TextIterator will just do nothing if its already at the end.
+        (khtml::CharacterIterator::advance): ditto.
+        * rendering/RenderTextField.cpp: (WebCore::RenderTextField::visiblePositionForIndex):
+        Since the asserts in the iterator are removed, we don't have to check for it.atEnd() before calling advance.
+
 2006-03-09  David Hyatt <hyatt@apple.com>
 

trunk/WebCore/editing/visible_text.cpp

@@ -131 +131 @@
 void TextIterator::advance()
 {
-    // otherwise, where are we advancing from?
-    assert(m_positionNode);
-
     // reset the run information
     m_positionNode = 0;
@@ -757 +754 @@
 void CharacterIterator::advance(int count)
 {
-    assert(!atEnd());
-
     m_atBreak = false;
 

trunk/WebCore/rendering/RenderTextField.cpp

@@ -178 +178 @@
 {    
     if (index <= 0)
-        return VisiblePosition(m_div.get(), 0, DOWNSTREAM);
+        return VisiblePosition(m_div.get(), 0, UPSTREAM);
     ExceptionCode ec = 0;
     RefPtr<RangeImpl> range = new RangeImpl(document());
     range->selectNodeContents(m_div.get(), ec);
     CharacterIterator it(range.get());
-    if (!it.atEnd())
-        it.advance(index - 1);
+    it.advance(index - 1);
     return VisiblePosition(it.range()->endContainer(ec), it.range()->endOffset(ec), UPSTREAM);
 }