Reviewed by Mark Rowe.

        - fix http://bugs.webkit.org/show_bug.cgi?id=16650
          <rdar://problem/5664872> REGRESSION (r28278-r28314): ATSUI uses LTR writing direction for all text runs

        Covered by existing pixel tests.

        * platform/graphics/mac/FontMac.mm:
        (WebCore::Font::drawComplexText): Corrected to maintain the style
        information in the adjusted text run when passing it to
        ATSUILayoutParameters. Prior to r28298 the style was passed separately.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29021 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bf78c6aaaa27eaa81e9544e9b62d243c4decd53c..5adbeada2208355d25c3251e03b40ab490faa281 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2007-12-28  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=16650
+          <rdar://problem/5664872> REGRESSION (r28278-r28314): ATSUI uses LTR writing direction for all text runs
+
+        Covered by existing pixel tests.
+
+        * platform/graphics/mac/FontMac.mm:
+        (WebCore::Font::drawComplexText): Corrected to maintain the style
+        information in the adjusted text run when passing it to
+        ATSUILayoutParameters. Prior to r28298 the style was passed separately.
+
 2007-12-29  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Build fix, not reviewed.

diff --git a/WebCore/platform/graphics/mac/FontMac.mm b/WebCore/platform/graphics/mac/FontMac.mm
index b0548a8d688b810b528ec8b39c8e474d00ac339d..2dba6133d8fc2666a35d5050f4d87ea345eaf243 100644 (file)
--- a/WebCore/platform/graphics/mac/FontMac.mm
+++ b/WebCore/platform/graphics/mac/FontMac.mm
@@ -517,7 +517,7 @@ void Font::drawComplexText(GraphicsContext* graphicsContext, const TextRun& run,
     if (run.directionalOverride())
         from++;
 
-    ATSULayoutParameters params(TextRun(adjustedRun.characters(), adjustedRun.length()));
+    ATSULayoutParameters params(adjustedRun);
     params.initialize(this, graphicsContext);
     
     // ATSUI can't draw beyond -32768 to +32767 so we translate the CTM and tell ATSUI to draw at (0, 0).