Changeset 25373 in webkit

Timestamp:

Sep 5, 2007 1:46:41 PM (17 years ago)

Author:

harrison

Message:

WebCore:

Reviewed by Kevin Decker.

<rdar://problem/5306171> Mail: The first return after an attachment in multipart/mixed message is lost

Test added: editing/selection/toString-1.html

Source changes:

• editing/TextIterator.cpp: (WebCore::TextIterator::shouldRepresentNodeOffsetZero):
• Remove outdated and erroneous check for m_lastTextNode.
• Fix VisiblePosition check to look for line diff. Simple position diff gives the wrong answer when the start is table/0 and the current is the first position inside the content of the table.

LayoutTests:

Reviewed by Kevin Decker.

Testcase for:
<rdar://problem/5306171> Mail: The first return after an attachment in multipart/mixed message is lost

• editing/selection/toString-1-expected.txt: Added.
• editing/selection/toString-1.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/toString-1-expected.txt (added)
• LayoutTests/editing/selection/toString-1.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/TextIterator.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-09-05  David Harrison  <harrison@apple.com>
+
+        Reviewed by Kevin Decker.
+
+        Testcase for:
+        <rdar://problem/5306171> Mail: The first return after an attachment in multipart/mixed message is lost
+
+        * editing/selection/toString-1-expected.txt: Added.
+        * editing/selection/toString-1.html: Added.
+
 2007-09-04  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-09-05  David Harrison  <harrison@apple.com>
+
+        Reviewed by Kevin Decker.
+
+        <rdar://problem/5306171> Mail: The first return after an attachment in multipart/mixed message is lost
+
+        Test added: editing/selection/toString-1.html
+        
+        Source changes:
+        * editing/TextIterator.cpp:
+        (WebCore::TextIterator::shouldRepresentNodeOffsetZero):
+        - Remove outdated and erroneous check for m_lastTextNode.
+        - Fix VisiblePosition check to look for line diff. Simple position diff gives the
+        wrong answer when the start is table/0 and the current is the first position
+        inside the content of the table.
+
 2007-09-04  Marvin Decker  <marv.decker@gmail.com>
 

trunk/WebCore/editing/TextIterator.cpp

@@ -509 +509 @@
 bool TextIterator::shouldRepresentNodeOffsetZero()
 {
-    // Can't represent the position without m_lastTextNode
-    if (!m_lastTextNode)
-        return false;
-    
     // Leave element positioned flush with start of a paragraph
     // (e.g. do not insert tab before a table cell at the start of a paragraph)
@@ -523 +519 @@
     
     // We've not emitted anything yet. Generally, there is no need for any positioning then.
-    // The only exception is when the element is visually not in the same position as
+    // The only exception is when the element is visually not in the same line as
     // the start of the range (e.g. the range starts at the end of the previous paragraph).
     // NOTE: Creating VisiblePositions and comparing them is relatively expensive, so we
@@ -537 +533 @@
     VisiblePosition startPos = VisiblePosition(m_startContainer, m_startOffset, DOWNSTREAM);
     VisiblePosition currPos = VisiblePosition(m_node, 0, DOWNSTREAM);
-    return startPos != currPos;
+    return !inSameLine(startPos, currPos);
 }