Title: [88487] trunk/Source/WebCore
Revision
88487
Author
[email protected]
Date
2011-06-09 14:48:35 -0700 (Thu, 09 Jun 2011)

Log 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.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (88486 => 88487)


--- trunk/Source/WebCore/ChangeLog	2011-06-09 21:45:18 UTC (rev 88486)
+++ trunk/Source/WebCore/ChangeLog	2011-06-09 21:48:35 UTC (rev 88487)
@@ -1,3 +1,14 @@
+2011-06-09  Dan Bernstein  <[email protected]>
+
+        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  <[email protected]>
 
         Reviewed by Antti Koivisto.

Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp (88486 => 88487)


--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp	2011-06-09 21:45:18 UTC (rev 88486)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp	2011-06-09 21:48:35 UTC (rev 88487)
@@ -172,7 +172,7 @@
     CFIndex runCount = CFArrayGetCount(runArray);
 
     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);
         m_complexTextRuns.append(ComplexTextRun::create(ctRun, fontData, cp, stringLocation, length, runRange));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to