wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge m-c to inbound. a=merge

Browse Source
This commit is contained in:
Ryan VanderMeulen 2015-01-14 13:46:46 -05:00
commit f9138a7b7b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
image/test/reftest/generic/reftest.list
View File

@ -1 +1 @@
fails-if(Android&&(AndroidVersion==10||AndroidVersion==17)) HTTP == accept-image-catchall.html accept-image-catchall-ref.html
HTTP == accept-image-catchall.html accept-image-catchall-ref.html

4
layout/reftests/backgrounds/reftest.list
View File

@ -124,7 +124,7 @@ fails == background-size-zoom-repeat.html background-size-zoom-repeat-ref.html
random-if(B2G) == fixed-bg-with-transform-outside-viewport-1.html fixed-bg-with-transform-outside-viewport-ref.html
HTTP == root-background-1.html root-background-ref.html
fails-if(Android&&(AndroidVersion==10||AndroidVersion==17)) HTTP != root-background-1.html about:blank
HTTP != root-background-1.html about:blank
random-if(B2G) == really-big-background.html really-big-background-ref.html
== body-background.html body-background-ref.html
@ -136,7 +136,7 @@ random-if(B2G) == really-big-background.html really-big-background-ref.html
== multi-background-clip-content-border.html multi-background-clip-content-border-ref.html
fails-if(Android&&(AndroidVersion==10||AndroidVersion==17)) HTTP == background-referrer.html background-referrer-ref.html
HTTP == background-referrer.html background-referrer-ref.html
== attachment-scroll-positioning-1.html attachment-scroll-positioning-1-ref.html
== attachment-local-positioning-1.html attachment-local-positioning-1-ref.html

4
layout/reftests/font-face/reftest.list
View File

@ -152,8 +152,8 @@ skip-if(B2G) HTTP(..) == missing-names.html missing-names-ref.html # bug 773482
# Tests for bug 670900 - handling of 404 (not found) error in @font-face URL
# (using Chunkfive font data returned from a .sjs file)
HTTP(..) == font-error-404-1.html font-error-404-1-ref.html # HTTP status 404, don't load
skip-if(B2G) fails-if(Android&&(AndroidVersion==10||AndroidVersion==17)) HTTP(..) == font-error-404-2.html font-error-404-2-ref.html # HTTP status 200, load # bug 773482
fails-if(Android&&(AndroidVersion==10||AndroidVersion==17)) HTTP(..) != font-error-404-1.html font-error-404-2.html # sanity-check that the results differ
skip-if(B2G) HTTP(..) == font-error-404-2.html font-error-404-2-ref.html # HTTP status 200, load # bug 773482
HTTP(..) != font-error-404-1.html font-error-404-2.html # sanity-check that the results differ
# Font load redirection
HTTP(..) == font-redirect.html order-1-ref.html