From 0ad94c38794c90637b02757e602c797c7981237a Mon Sep 17 00:00:00 2001 From: Jonathan Kew Date: Wed, 7 Apr 2010 10:18:57 +0100 Subject: [PATCH] bug 554188 - handle trailing whitespace on bidi-overridden text runs consistently on OS X 10.6. r=roc --- gfx/thebes/src/gfxCoreTextShaper.cpp | 2 +- layout/reftests/bugs/reftest.list | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gfx/thebes/src/gfxCoreTextShaper.cpp b/gfx/thebes/src/gfxCoreTextShaper.cpp index a477d3c4544..a5c1ea85440 100644 --- a/gfx/thebes/src/gfxCoreTextShaper.cpp +++ b/gfx/thebes/src/gfxCoreTextShaper.cpp @@ -135,7 +135,7 @@ gfxCoreTextShaper::InitTextRun(gfxContext *aContext, // to ensure neutrals or characters that were bidi-overridden in HTML behave properly. const UniChar beginLTR[] = { 0x202d, 0x20 }; const UniChar beginRTL[] = { 0x202e, 0x20 }; - const UniChar endBidiWrap[] = { 0x20, 0x202c }; + const UniChar endBidiWrap[] = { 0x20, 0x2e, 0x202c }; PRUint32 startOffset; CFStringRef stringObj; diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index 5deeb819d07..0ec55ddd197 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -1400,7 +1400,7 @@ fails HTTP(..) == 518172-2b.html 518172-b-ref.html # bug 518172 == 534526-1b.html 534526-1-ref.html == 534808-1.html 534808-1-ref.html == 534808-2.html 534808-2-ref.html -fails-if(http.oscpu.match(/Mac\x20OS\x20X\x2010\.6$/)) == 534919-1.html 534919-1-ref.html # fails on 10.6, bug 554188 +== 534919-1.html 534919-1-ref.html == 537507-1.xul 537507-1-ref.xul == 537507-2.html 537507-2-ref.html == 537471-1.html 537471-1-ref.html