Changeset 61921 in webkit

Timestamp:

Jun 25, 2010 5:31:54 PM (14 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/8000667> Certain text is repeated before and after a line break

Reviewed by Sam Weinig.

WebCore:

Test: fast/text/bidi-explicit-embedding-past-end.html

• platform/text/BidiResolver.h:

(WebCore::::createBidiRunsForLine): Committing explicit embedding past the end of the range
creates BidiRuns up to the end of the range, so at that point, we can stop iterating.

LayoutTests:

• fast/text/bidi-explicit-embedding-past-end-expected.checksum: Added.
• fast/text/bidi-explicit-embedding-past-end-expected.png: Added.
• fast/text/bidi-explicit-embedding-past-end-expected.txt: Added.
• fast/text/bidi-explicit-embedding-past-end.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/bidi-explicit-embedding-past-end-expected.checksum (added)
• LayoutTests/fast/text/bidi-explicit-embedding-past-end-expected.png (added)
• LayoutTests/fast/text/bidi-explicit-embedding-past-end-expected.txt (added)
• LayoutTests/fast/text/bidi-explicit-embedding-past-end.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/text/BidiResolver.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-25  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        <rdar://problem/8000667> Certain text is repeated before and after a line break
+
+        * fast/text/bidi-explicit-embedding-past-end-expected.checksum: Added.
+        * fast/text/bidi-explicit-embedding-past-end-expected.png: Added.
+        * fast/text/bidi-explicit-embedding-past-end-expected.txt: Added.
+        * fast/text/bidi-explicit-embedding-past-end.html: Added.
+
 2010-06-25  Alpha Lam  <hclam@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-25  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        <rdar://problem/8000667> Certain text is repeated before and after a line break
+
+        Test: fast/text/bidi-explicit-embedding-past-end.html
+
+        * platform/text/BidiResolver.h:
+        (WebCore::::createBidiRunsForLine): Committing explicit embedding past the end of the range
+        creates BidiRuns up to the end of the range, so at that point, we can stop iterating.
+
 2010-06-25  Eric Seidel  <eric@webkit.org>
 

trunk/WebCore/platform/text/BidiResolver.h

@@ -807 +807 @@
         }
 
-        if (pastEnd) {
-            if (eor == current) {
-                if (!reachedEndOfLine) {
-                    eor = endOfLine;
-                    switch (m_status.eor) {
-                        case LeftToRight:
-                        case RightToLeft:
-                        case ArabicNumber:
-                            m_direction = m_status.eor;
-                            break;
-                        case EuropeanNumber:
-                            m_direction = m_status.lastStrong == LeftToRight ? LeftToRight : EuropeanNumber;
-                            break;
-                        default:
-                            ASSERT(false);
-                    }
-                    appendRun();
+        if (pastEnd && eor == current) {
+            if (!reachedEndOfLine) {
+                eor = endOfLine;
+                switch (m_status.eor) {
+                    case LeftToRight:
+                    case RightToLeft:
+                    case ArabicNumber:
+                        m_direction = m_status.eor;
+                        break;
+                    case EuropeanNumber:
+                        m_direction = m_status.lastStrong == LeftToRight ? LeftToRight : EuropeanNumber;
+                        break;
+                    default:
+                        ASSERT(false);
                 }
-                current = end;
-                m_status = stateAtEnd.m_status;
-                sor = stateAtEnd.sor; 
-                eor = stateAtEnd.eor;
-                last = stateAtEnd.last;
-                reachedEndOfLine = stateAtEnd.reachedEndOfLine;
-                lastBeforeET = stateAtEnd.lastBeforeET;
-                emptyRun = stateAtEnd.emptyRun;
-                m_direction = OtherNeutral;
-                break;
-            }
+                appendRun();
+            }
+            current = end;
+            m_status = stateAtEnd.m_status;
+            sor = stateAtEnd.sor; 
+            eor = stateAtEnd.eor;
+            last = stateAtEnd.last;
+            reachedEndOfLine = stateAtEnd.reachedEndOfLine;
+            lastBeforeET = stateAtEnd.lastBeforeET;
+            emptyRun = stateAtEnd.emptyRun;
+            m_direction = OtherNeutral;
+            break;
         }
 
@@ -888 +886 @@
 
         increment();
-        if (!m_currentExplicitEmbeddingSequence.isEmpty())
+        if (!m_currentExplicitEmbeddingSequence.isEmpty()) {
             commitExplicitEmbedding();
+            if (pastEnd) {
+                current = end;
+                m_status = stateAtEnd.m_status;
+                sor = stateAtEnd.sor; 
+                eor = stateAtEnd.eor;
+                last = stateAtEnd.last;
+                reachedEndOfLine = stateAtEnd.reachedEndOfLine;
+                lastBeforeET = stateAtEnd.lastBeforeET;
+                emptyRun = stateAtEnd.emptyRun;
+                m_direction = OtherNeutral;
+                break;
+            }
+        }
 
         if (emptyRun && (dirCurrent == RightToLeftEmbedding