Changeset 109384 in webkit

Timestamp:

Mar 1, 2012, 12:00:24 PM (15 years ago)

Author:

cevans@google.com

Message:

Merge 108417
BUG=114054
Review URL: ​https://chromiumcodereview.appspot.com/9568027

Location:

branches/chromium/963

Files:

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

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

@@ -488 +488 @@
     }
 
-    if (!renderer->firstTextBox() && str.length() > 0) {
-        if (!m_handledFirstLetter && renderer->isTextFragment()) {
-            handleTextNodeFirstLetter(static_cast<RenderTextFragment*>(renderer));
-            if (m_firstLetterText) {
-                handleTextBox();
-                return false;
-            }
-        }
+    if (renderer->firstTextBox())
+        m_textBox = renderer->firstTextBox();
+
+    bool shouldHandleFirstLetter = !m_handledFirstLetter && renderer->isTextFragment() && !m_offset;
+    if (shouldHandleFirstLetter)
+        handleTextNodeFirstLetter(static_cast<RenderTextFragment*>(renderer));
+
+    if (!renderer->firstTextBox() && str.length() > 0 && !shouldHandleFirstLetter) {
         if (renderer->style()->visibility() != VISIBLE && !m_ignoresStyleVisibility)
             return false;
@@ -501 +501 @@
         return true;
     }
-
-    
-    m_textBox = renderer->firstTextBox();
-    if (!m_handledFirstLetter && renderer->isTextFragment() && !m_offset)
-        handleTextNodeFirstLetter(static_cast<RenderTextFragment*>(renderer));
 
     if (m_firstLetterText)
@@ -563 +558 @@
         } else 
             nextTextBox = m_textBox->nextTextBox();
+        ASSERT(!nextTextBox || nextTextBox->renderer() == renderer);
 
         if (runStart < runEnd) {
@@ -631 +627 @@
             m_remainingTextBox = m_textBox;
             m_textBox = firstLetter->firstTextBox();
+            m_sortedTextBoxes.clear();
             m_firstLetterText = firstLetter;
         }