Changeset 88487 in webkit

Timestamp:

Jun 9, 2011, 2:48:35 PM (14 years ago)

Author:

mitz@apple.com

Message:

Fix a regression from r88478.

Reviewed by Darin Adler.

• platform/graphics/mac/ComplexTextControllerCoreText.cpp:

(WebCore::ComplexTextController::collectComplexTextRunsForCharactersCoreText): Add the runs
in reverse order in the RTL case here, since the whole vector is reversed by collectComplexTextRuns()
afterwards.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/mac/ComplexTextControllerCoreText.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-09  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Fix a regression from r88478.
+
+        * platform/graphics/mac/ComplexTextControllerCoreText.cpp:
+        (WebCore::ComplexTextController::collectComplexTextRunsForCharactersCoreText): Add the runs
+        in reverse order in the RTL case here, since the whole vector is reversed by collectComplexTextRuns()
+        afterwards.
+
 2011-06-09  Julien Chaffraix  <jchaffraix@codeaurora.org>
 

trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp

@@ -173 +173 @@
 
     for (CFIndex r = 0; r < runCount; r++) {
-        CTRunRef ctRun = static_cast<CTRunRef>(CFArrayGetValueAtIndex(runArray, r));
+        CTRunRef ctRun = static_cast<CTRunRef>(CFArrayGetValueAtIndex(runArray, m_run.ltr() ? r : runCount - 1 - r));
         ASSERT(CFGetTypeID(ctRun) == CTRunGetTypeID());
         CFRange runRange = CTRunGetStringRange(ctRun);