Bug 1341102 - stylo test expectation adjustments. r=me a=merge (CLOSED TREE)

MozReview-Commit-ID: FhM4y855OYU

--HG--
extra : amend_source : 74196a9e40f3d1cb334557b9ec4e929c379a8904

layout/reftests/w3c-css/failures.list

@@ -72,7 +72,7 @@ fuzzy-if(winWidget,110,1200) css-writing-modes-3/table-column-order-slr-007.xht
 fuzzy-if(OSX||winWidget,110,1200) css-writing-modes-3/table-column-order-srl-006.xht
 fuzzy-if(OSX||winWidget,75,404)   css-writing-modes-3/text-align-v??-0??.xht
 fuzzy-if(OSX||winWidget,215,780)  css-writing-modes-3/text-baseline-???-00?.xht
-fuzzy-if(OSX,15,16)    css-writing-modes-3/text-combine-upright-decorations-001.html
+skip-if(stylo) fuzzy-if(OSX,15,16)    css-writing-modes-3/text-combine-upright-decorations-001.html
 fuzzy-if(OSX||winWidget,255,480)  css-writing-modes-3/text-indent-v??-0??.xht
 fuzzy-if(OSX||winWidget,226,960)  css-writing-modes-3/text-orientation-016.xht
 fuzzy-if(OSX||winWidget,223,720)  css-writing-modes-3/vertical-alignment-*.xht
@@ -144,7 +144,7 @@ fails-if(stylo) css-writing-modes-3/full-width-001.html
 fails-if(stylo) css-writing-modes-3/full-width-002.html
 fails-if(stylo) css-writing-modes-3/text-combine-upright-inherit-all-001.html
 fails-if(stylo) css-writing-modes-3/text-combine-upright-inherit-all-002.html
-fails-if(stylo) css-writing-modes-3/text-combine-upright-layout-rules-001.html
+css-writing-modes-3/text-combine-upright-layout-rules-001.html
 fails-if(stylo) css-writing-modes-3/text-combine-upright-line-breaking-rules-001.html
 
 #### CSS Multi-column 1 ##############################################

layout/reftests/w3c-css/submitted/ruby/reftest.list

@@ -14,7 +14,7 @@ skip-if(stylo) == ruby-inlinize-blocks-005.html ruby-inlinize-blocks-005-ref.htm
 # Tests for ruby with text-combine-upright
 fails-if(stylo) == ruby-text-combine-upright-001a.html ruby-text-combine-upright-001-ref.html
 fails-if(stylo) == ruby-text-combine-upright-001b.html ruby-text-combine-upright-001-ref.html
-== ruby-text-combine-upright-002a.html ruby-text-combine-upright-002-ref.html
+fails-if(stylo) == ruby-text-combine-upright-002a.html ruby-text-combine-upright-002-ref.html
 fails-if(stylo) == ruby-text-combine-upright-002b.html ruby-text-combine-upright-002-ref.html
 
 # Tests for nested ruby

layout/reftests/w3c-css/submitted/writing-modes-3/reftest.list

@@ -1,7 +1,7 @@
 default-preferences pref(layout.css.text-combine-upright.enabled,true)
 
-fails-if(stylo) == text-combine-upright-break-inside-001.html text-combine-upright-break-inside-001-ref.html
+== text-combine-upright-break-inside-001.html text-combine-upright-break-inside-001-ref.html
-fails-if(stylo) == text-combine-upright-break-inside-001a.html text-combine-upright-break-inside-001-ref.html
+== text-combine-upright-break-inside-001a.html text-combine-upright-break-inside-001-ref.html
 fails-if(stylo) == text-combine-upright-compression-001.html text-combine-upright-compression-001-ref.html
 fails-if(stylo) == text-combine-upright-compression-002.html text-combine-upright-compression-002-ref.html
 fails-if(stylo) == text-combine-upright-compression-003.html text-combine-upright-compression-003-ref.html
@@ -10,7 +10,7 @@ fails-if(stylo) == text-combine-upright-compression-005.html text-combine-uprigh
 fails-if(stylo) == text-combine-upright-compression-005a.html text-combine-upright-compression-005-ref.html
 fails-if(stylo) == text-combine-upright-compression-006.html text-combine-upright-compression-006-ref.html
 fails-if(stylo) == text-combine-upright-compression-006a.html text-combine-upright-compression-006-ref.html
-fails-if(stylo) == text-combine-upright-compression-007.html text-combine-upright-compression-007-ref.html
+== text-combine-upright-compression-007.html text-combine-upright-compression-007-ref.html
 
 == text-orientation-upright-directionality-001.html text-orientation-upright-directionality-001-ref.html