bug 554188 - handle trailing whitespace on bidi-overridden text runs consistently on OS X 10.6. r=roc
authorJonathan Kew <jfkthame@gmail.com>
Wed, 07 Apr 2010 10:18:57 +0100
changeset 40536 6bdb8153b6715707740630f8dc45e2afdd74b25f
parent 40535 b703c6e2ac3f4df6e74ce7678d7a410f0906773e
child 40537 5b3ca7b7c9ddc244b022ffe0e4395be21b541c7c
child 40541 231cc7025b6f63a292f4106477e16552f29cabff
push id12654
push userjkew@mozilla.com
push dateWed, 07 Apr 2010 09:20:04 +0000
treeherdermozilla-central@6bdb8153b671 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs554188
milestone1.9.3a4pre
first release with
nightly linux32
6bdb8153b671 / 3.7a4pre / 20100407031010 / files
nightly linux64
6bdb8153b671 / 3.7a4pre / 20100407030627 / files
nightly mac
6bdb8153b671 / 3.7a4pre / 20100407030830 / files
nightly win32
6bdb8153b671 / 3.7a4pre / 20100407040554 / files
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
bug 554188 - handle trailing whitespace on bidi-overridden text runs consistently on OS X 10.6. r=roc
gfx/thebes/src/gfxCoreTextShaper.cpp
layout/reftests/bugs/reftest.list
--- a/gfx/thebes/src/gfxCoreTextShaper.cpp
+++ b/gfx/thebes/src/gfxCoreTextShaper.cpp
@@ -130,17 +130,17 @@ gfxCoreTextShaper::InitTextRun(gfxContex
             }
         }
     }
 
     // If there's a possibility of any bidi, we wrap the text with direction overrides
     // 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;
     if (bidiWrap) {
         startOffset = isRTL ?
             sizeof(beginRTL) / sizeof(beginRTL[0]) : sizeof(beginLTR) / sizeof(beginLTR[0]);
         CFMutableStringRef mutableString =
             ::CFStringCreateMutable(kCFAllocatorDefault,
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1395,17 +1395,17 @@ fails HTTP(..) == 518172-2b.html 518172-
 == 528096-1.html 528096-1-ref.html
 == 530686-1.html 530686-1-ref.html
 == 531098-1.html 531098-1-ref.html
 == 531371-1.html 531371-1-ref.html
 == 534526-1a.html 534526-1-ref.html
 == 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
 == 538909-1.html 538909-1-ref.html
 == 538935-1.html 538935-1-ref.html
 == 539226-1.html about:blank
 == 539323-1.html 539323-1-ref.html
 == 539323-2.html 539323-2-ref.html