From 101fa257682ee6ed20d58ed1e9301d087ba6f5c1 Mon Sep 17 00:00:00 2001 From: "mitz@apple.com" Date: Sat, 29 Dec 2007 04:19:30 +0000 Subject: [PATCH] Reviewed by Mark Rowe. - fix http://bugs.webkit.org/show_bug.cgi?id=16650 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 --- WebCore/ChangeLog | 14 ++++++++++++++ WebCore/platform/graphics/mac/FontMac.mm | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index bf78c6aaaa27..5adbeada2208 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,17 @@ +2007-12-28 Dan Bernstein + + Reviewed by Mark Rowe. + + - fix http://bugs.webkit.org/show_bug.cgi?id=16650 + 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 Build fix, not reviewed. diff --git a/WebCore/platform/graphics/mac/FontMac.mm b/WebCore/platform/graphics/mac/FontMac.mm index b0548a8d688b..2dba6133d8fc 100644 --- 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). -- 2.36.0