Changeset 90858 in webkit

Timestamp:

Jul 12, 2011, 3:14:47 PM (14 years ago)

Author:

cevans@google.com

Message:

Merge 89831
BUG=87298
Review URL: ​http://codereview.chromium.org/7350003

Location:

branches/chromium/782

Files:

• LayoutTests/editing/text-iterator/first-letter-rtl-crash-expected.txt (copied) (copied from trunk/LayoutTests/editing/text-iterator/first-letter-rtl-crash-expected.txt )
• LayoutTests/editing/text-iterator/first-letter-rtl-crash.html (copied) (copied from trunk/LayoutTests/editing/text-iterator/first-letter-rtl-crash.html )
• Source/WebCore/editing/TextIterator.cpp (modified) (4 diffs)

branches/chromium/782/Source/WebCore/editing/TextIterator.cpp

@@ -460 +460 @@
             return false;
         }
-        if (!m_handledFirstLetter && renderer->isTextFragment()) {
+        if (!m_handledFirstLetter && renderer->isTextFragment() && !m_offset) {
             handleTextNodeFirstLetter(static_cast<RenderTextFragment*>(renderer));
             if (m_firstLetterText) {
@@ -497 +497 @@
     }
 
+    
+    m_textBox = renderer->firstTextBox();
+    if (!m_handledFirstLetter && renderer->isTextFragment() && !m_offset)
+        handleTextNodeFirstLetter(static_cast<RenderTextFragment*>(renderer));
+
+    if (m_firstLetterText)
+        renderer = m_firstLetterText;
+
     // Used when text boxes are out of order (Hebrew/Arabic w/ embeded LTR text)
     if (renderer->containsReversedText()) {
@@ -505 +513 @@
         std::sort(m_sortedTextBoxes.begin(), m_sortedTextBoxes.end(), InlineTextBox::compareByStart); 
         m_sortedTextBoxesPosition = 0;
-    }
-    
-    m_textBox = renderer->containsReversedText() ? (m_sortedTextBoxes.isEmpty() ? 0 : m_sortedTextBoxes[0]) : renderer->firstTextBox();
-    if (!m_handledFirstLetter && renderer->isTextFragment() && !m_offset)
-        handleTextNodeFirstLetter(static_cast<RenderTextFragment*>(renderer));
+        m_textBox = m_sortedTextBoxes.isEmpty() ? 0 : m_sortedTextBoxes[0];
+    }
+
     handleTextBox();
     return true;
@@ -976 +982 @@
     m_text = m_emitsTextWithoutTranscoding ? renderer->textWithoutTranscoding() : renderer->text();
     ASSERT(m_text.characters());
+    ASSERT(0 <= textStartOffset && textStartOffset < static_cast<int>(m_text.length()));
+    ASSERT(0 <= textEndOffset && textEndOffset <= static_cast<int>(m_text.length()));
+    ASSERT(textStartOffset <= textEndOffset);
 
     m_positionNode = textNode;