--- a/layout/reftests/text/reftest.list
+++ b/layout/reftests/text/reftest.list
@@ -1,13 +1,13 @@
-fails-if(Android||B2G) == fallback-01.xhtml fallback-01-ref.xhtml
+fails-if(Android) == fallback-01.xhtml fallback-01-ref.xhtml
== font-selection-by-lang-01.html font-selection-by-lang-01-ref.html
-skip-if(B2G||Mulet) HTTP(..) == font-selection-fallback-1.html font-selection-fallback-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) HTTP(..) == font-selection-generic-1.html font-selection-generic-1-ref.html # bug 773482 # Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android||B2G) != font-size-adjust-01.html font-size-adjust-01-ref.html
+HTTP(..) == font-selection-fallback-1.html font-selection-fallback-1-ref.html
+HTTP(..) == font-selection-generic-1.html font-selection-generic-1-ref.html
+fails-if(Android) != font-size-adjust-01.html font-size-adjust-01-ref.html
# The following test passes consistently only on Mac OS X;
# both Windows and Linux give results that vary depending on the font size/zoom factor used,
# because hinting affects the metrics used to compute the font size adjustment. See bug 429605.
random-if(!cocoaWidget) == font-size-adjust-02.html font-size-adjust-02-ref.html
# This currently fails because line spacing does not respect font-size-adjust
# in the "obvious" way, but it is unclear what the behavior should really be;
# see bug #366138 for some (inconclusive) discussion
# == font-size-adjust-03.html font-size-adjust-03-ref.html
@@ -23,17 +23,17 @@ HTTP(..) load ligature-with-space-1.html
== line-editing-1b.html line-editing-1-ref.html
== line-editing-1c.html line-editing-1-ref.html
== line-editing-1d.html line-editing-1-ref.html
== line-editing-1e.html line-editing-1-ref.html
fails-if(cocoaWidget||(winWidget&&dwrite)) HTTP(..) == lineheight-metrics-1.html lineheight-metrics-1-ref.html # bug 657864
HTTP(..) == lineheight-metrics-2a.html lineheight-metrics-2-ref.html
HTTP(..) == lineheight-metrics-2b.html lineheight-metrics-2-ref.html
== lineheight-percentage-1.html lineheight-percentage-1-ref.html
-skip-if(B2G||Mulet) == long-1.html long-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
+== long-1.html long-ref.html
fuzzy-if(Android,255,147) == pre-line-1.html pre-line-1-ref.html
== pre-line-2.html pre-line-2-ref.html
== pre-line-3.html pre-line-3-ref.html
== pre-line-4.html pre-line-4-ref.html
== pre-space-1.html pre-space-1-ref.html
== pre-wrap-1.html pre-wrap-1-ref.html
== soft-hyphens-1a.html soft-hyphens-1-ref.html
== soft-hyphens-1b.html soft-hyphens-1-ref.html
@@ -50,20 +50,20 @@ fuzzy-if(Android,255,147) == pre-line-1.
# 1 CSS pixel == 1 device pixel
fails-if(Android) skip-if(d2d||cocoaWidget||skiaContent) == subpixel-glyphs-x-1a.html subpixel-glyphs-x-1b.html
# Platforms with subpixel positioning already have inconsistent glyphs by
# design, but that is considered more tolerable because they are subpixel
# inconsistencies. On those platforms we just test that glyph positions are
# subpixel.
# D2D/DirectWrite results depend on the rendering mode chosen, so considering this as random for now.
skip-if(!(d2d||cocoaWidget)) random-if(d2d) != subpixel-glyphs-x-2a.html subpixel-glyphs-x-2b.html
-skip-if(B2G||Mulet) HTTP(..) == subpixel-glyphs-x-3a.html subpixel-glyphs-x-3b.html # Initial mulet triage: parity with B2G/B2G Desktop
+HTTP(..) == subpixel-glyphs-x-3a.html subpixel-glyphs-x-3b.html
# No platforms do subpixel positioning vertically
fuzzy-if(Android,19,2) == subpixel-glyphs-y-1a.html subpixel-glyphs-y-1b.html
-fuzzy-if((Android||B2G),231,653) == subpixel-lineheight-1a.html subpixel-lineheight-1b.html
+fuzzy-if(Android,231,653) == subpixel-lineheight-1a.html subpixel-lineheight-1b.html
== swash-1.html swash-1-ref.html
HTTP(..) != synthetic-bold-metrics-01.html synthetic-bold-metrics-01-notref.html
HTTP(..) == synthetic-bold-papyrus-01.html synthetic-bold-papyrus-01-ref.html
# Tests for text-align-last
== text-align-last-start.html text-align-last-start-ref.html
== text-align-last-end.html text-align-last-end-ref.html
== text-align-last-center.html text-align-last-center-ref.html
== text-align-last-justify.html text-align-last-justify-ref.html
@@ -109,99 +109,99 @@ HTTP(..) == synthetic-bold-papyrus-01.ht
== text-align-left-in-rtl-block.html text-align-left-in-rtl-block-ref.html
HTTP(..) == variation-selector-unsupported-1.html variation-selector-unsupported-1-ref.html
== white-space-1a.html white-space-1-ref.html
== white-space-1b.html white-space-1-ref.html
== white-space-2.html white-space-2-ref.html
== wordbreak-1.html wordbreak-1-ref.html
== wordbreak-2.html wordbreak-2-ref.html
== wordbreak-3.html wordbreak-3-ref.html
-skip-if((Android)||(B2G&&browserIsRemote)) == wordbreak-4a.html wordbreak-4a-ref.html
+skip-if(Android) == wordbreak-4a.html wordbreak-4a-ref.html
== wordbreak-4b.html wordbreak-4b-ref.html
== wordbreak-5.html wordbreak-5-ref.html
fails-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)) == wordbreak-6.html wordbreak-6-ref.html # Bug 1258239
-skip-if(B2G||Mulet) HTTP(..) == wordbreak-7a.html wordbreak-7a-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
+HTTP(..) == wordbreak-7a.html wordbreak-7a-ref.html
fails HTTP(..) == wordbreak-7b.html wordbreak-7b-ref.html # bug 479829
== wordbreak-8.html wordbreak-8-ref.html
pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == wordbreak-9.html wordbreak-9-ref.html
== wordwrap-01.html wordwrap-01-ref.html
HTTP(..) == wordwrap-02.html wordwrap-02-ref.html
-fuzzy-if(gtkWidget,1,177) fuzzy-if(skiaContent,1,50) skip-if(B2G||Mulet) HTTP(..) == wordwrap-03.html wordwrap-03-ref.html # Initial mulet triage: parity with B2G/B2G Desktop # Fuzzy on Linux because the native textbox gradient is painted in a slightly different position depending on the invalid area.
+fuzzy-if(gtkWidget,1,177) fuzzy-if(skiaContent,1,50) HTTP(..) == wordwrap-03.html wordwrap-03-ref.html # Fuzzy on Linux because the native textbox gradient is painted in a slightly different position depending on the invalid area.
== wordwrap-04.html wordwrap-04-ref.html
== overflowwrap-04.html wordwrap-04-ref.html
== wordwrap-05.html wordwrap-05-ref.html
== overflowwrap-05.html wordwrap-05-ref.html
== wordwrap-06.html wordwrap-06-ref.html
== overflowwrap-06.html wordwrap-06-ref.html
== wordwrap-07.html wordwrap-07-ref.html
== overflowwrap-07.html wordwrap-07-ref.html
-skip-if(B2G||Mulet) != wordwrap-08.html wordwrap-01-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == wordwrap-08.html wordwrap-08-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) != wordwrap-09.html wordwrap-01-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) != overflowwrap-09.html wordwrap-01-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == wordwrap-09.html wordwrap-09-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == overflowwrap-09.html wordwrap-09-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
+!= wordwrap-08.html wordwrap-01-ref.html
+== wordwrap-08.html wordwrap-08-ref.html
+!= wordwrap-09.html wordwrap-01-ref.html
+!= overflowwrap-09.html wordwrap-01-ref.html
+== wordwrap-09.html wordwrap-09-ref.html
+== overflowwrap-09.html wordwrap-09-ref.html
== wordwrap-10.html wordwrap-10-ref.html # bug 752459
== overflowwrap-10.html wordwrap-10-ref.html
== word-spacing-01.html word-spacing-01-ref.html
# the following will fail when rendering with Core Text (see bug 389074) due to what appears to be
# an Apple bug: the presence of ZWNJ disturbs the positioning of an adjacent glyph. rdar://6427865
random-if(cocoaWidget) HTTP(..) == zwnj-01.xhtml zwnj-01-ref.xhtml
HTTP(..) == zwnj-02.xhtml zwnj-02-ref.xhtml # HTTP(..) for ../filters.svg
!= zwnj-01.html zwnj-01-notref.html
== initial-zwj-1.html initial-zwj-1-ref.html
== cgj-01.html cgj-01-ref.html
== 444656.html 444656-ref.html
== 449555-1.html 449555-1-ref.html
== 467722.html 467722-ref.html
-skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,600) HTTP(..) == 475092-sub.html 475092-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android) skip-if(B2G||Mulet) fuzzy-if(skiaContent&&!Android,89,3100) HTTP(..) == 475092-pos.html 475092-sub.html # bug 482596 # Initial mulet triage: parity with B2G/B2G Desktop
+fuzzy-if(skiaContent,1,600) HTTP(..) == 475092-sub.html 475092-ref.html
+fails-if(Android) fuzzy-if(skiaContent&&!Android,89,3100) HTTP(..) == 475092-pos.html 475092-sub.html # bug 482596
== 476378-soft-hyphen-fallback.html 476378-soft-hyphen-fallback-ref.html
# Test for bug 484954
== rgba-text.html rgba-text-ref.html
# Test for bug 575695, 'kern' table support
HTTP(..) != kerning-01.html kerning-01-notref.html
# Test for bug 577380, support for AAT layout (on OS X only)
random-if(!cocoaWidget) == 577380.html 577380-ref.html
# Test for OpenType Arabic shaping support
HTTP(..) == arabic-shaping-1.html arabic-shaping-1-ref.html
# check ligature in Arial Bold on Windows, for bug 644184; may fail on other platforms depending on fonts
random-if(!winWidget) == arial-bold-lam-alef-1.html arial-bold-lam-alef-1-ref.html
# Fallback (presentation-forms) shaping with a font that lacks GSUB/GPOS
# These tests are not valid with Mac or FT2 font backends because our masking of complex-script ranges
# in the 'cmap' will prevent the test font (without GSUB) being used.
-skip-if(B2G||Mulet) fails-if(cocoaWidget||Android) HTTP(..) == arabic-fallback-1.html arabic-fallback-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(cocoaWidget||Android||B2G) HTTP(..) == arabic-fallback-2.html arabic-fallback-2-ref.html
-fails-if(cocoaWidget||Android||B2G) HTTP(..) == arabic-fallback-3.html arabic-fallback-3-ref.html
-fails-if(!cocoaWidget&&!Android&&!B2G) HTTP(..) != arabic-fallback-4.html arabic-fallback-4-notref.html
+fails-if(cocoaWidget||Android) HTTP(..) == arabic-fallback-1.html arabic-fallback-1-ref.html
+fails-if(cocoaWidget||Android) HTTP(..) == arabic-fallback-2.html arabic-fallback-2-ref.html
+fails-if(cocoaWidget||Android) HTTP(..) == arabic-fallback-3.html arabic-fallback-3-ref.html
+fails-if(!cocoaWidget&&!Android) HTTP(..) != arabic-fallback-4.html arabic-fallback-4-notref.html
== arabic-marks-1.html arabic-marks-1-ref.html
fails-if(OSX<1008) == arabic-final-ligature-spacing.html arabic-final-ligature-spacing-ref.html
# harfbuzz fallback mark stacking in the absence of GPOS:
HTTP(..) != fallback-mark-stacking-1.html fallback-mark-stacking-1-notref.html
== 726392-1.html 726392-1-ref.html
== 726392-2.html 726392-2-ref.html
-skip-if(B2G||Mulet) == 726392-3.html 726392-3-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
+== 726392-3.html 726392-3-ref.html
== 745555-1.html 745555-1-ref.html
== 745555-2.html 745555-2-ref.html
== 820255.html 820255-ref.html
HTTP(..) != 1170688.html 1170688-ref.html
# ensure emoji chars don't render blank (bug 715798, bug 779042);
# should at least render hexboxes if there's no font support
!= emoji-01.html emoji-01-notref.html
!= emoji-02.html emoji-02-notref.html
# Bug 727276: tests with variation selectors 15 and 16 to control emoji rendering style
== emoji-03.html emoji-03-ref.html
# the next two will fail on OS X 10.6 because no color emoji font is present,
-# and also on Android/B2G platforms until we have color emoji fonts there.
+# and also on Android platforms until we have color emoji fonts there.
# Tests rely on bundled EmojiOne Mozilla to pass on Windows <8.1 and Linux.
-fails-if(OSX==1006||B2G||Android) != emoji-03.html emoji-03-notref.html
-fails-if(OSX==1006||B2G||Android) == emoji-04.html emoji-04-ref.html
+fails-if(OSX==1006||Android) != emoji-03.html emoji-03-notref.html
+fails-if(OSX==1006||Android) == emoji-04.html emoji-04-ref.html
!= emoji-05.html emoji-05-notref.html
# check that Graphite shaping (bug 631479) is working
pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == graphite-01.html graphite-01-ref.html
# Test 02 (using Pig Latin) is fuzzy on Win7 because glyph positioning is not guaranteed to match exactly
# between a sequence of simple glyphs rendered individually, and the same sequence treated as a single cluster.
fuzzy-if(winWidget,49,220) pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == graphite-02.html graphite-02-ref.html
pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) != graphite-03a.html graphite-03-notref.html