Bug 1302225 - Backout skia windows. r=me

This commit is contained in:
Mason Chang 2016-09-13 08:05:49 -07:00
parent b5c10b4d4e
commit cdb3b318be
11 changed files with 76 additions and 13 deletions

View File

@ -86,17 +86,17 @@ fuzzy-if(winWidget,1,21) == clip-path-contentBox-1c.html clip-path-geometryBox-1
fuzzy-if(winWidget,1,21) == clip-path-paddingBox-1a.html clip-path-geometryBox-1-ref.html
fuzzy-if(winWidget,1,21) == clip-path-paddingBox-1b.html clip-path-geometryBox-1-ref.html
fuzzy-if(winWidget,1,21) == clip-path-paddingBox-1c.html clip-path-geometryBox-1-ref.html
fuzzy(64,311) == clip-path-borderBox-1a.html clip-path-geometryBox-1-ref.html
fuzzy(64,370) == clip-path-borderBox-1a.html clip-path-geometryBox-1-ref.html
fuzzy-if(winWidget,1,21) == clip-path-borderBox-1b.html clip-path-geometryBox-1-ref.html
fuzzy(64,311) == clip-path-borderBox-1c.html clip-path-geometryBox-1-ref.html
fuzzy(64,370) == clip-path-borderBox-1c.html clip-path-geometryBox-1-ref.html
fuzzy-if(winWidget,1,21) == clip-path-marginBox-1a.html clip-path-geometryBox-1-ref.html
fuzzy(64,311) == clip-path-fillBox-1a.html clip-path-geometryBox-1-ref.html
fuzzy(64,311) == clip-path-strokeBox-1a.html clip-path-geometryBox-1-ref.html
fuzzy(64,311) == clip-path-strokeBox-1b.html clip-path-geometryBox-1-ref.html
fuzzy(64,370) == clip-path-fillBox-1a.html clip-path-geometryBox-1-ref.html
fuzzy(64,370) == clip-path-strokeBox-1a.html clip-path-geometryBox-1-ref.html
fuzzy(64,370) == clip-path-strokeBox-1b.html clip-path-geometryBox-1-ref.html
fuzzy-if(winWidget,1,21) == clip-path-viewBox-1a.html clip-path-geometryBox-1-ref.html
fuzzy-if(winWidget,1,21) == clip-path-viewBox-1b.html clip-path-geometryBox-1-ref.html
fuzzy(64,311) == clip-path-viewBox-1c.html clip-path-geometryBox-1-ref.html
fuzzy-if(winWidget,1,98) == clip-path-geometryBox-2.html clip-path-geometryBox-2-ref.html
fuzzy(64,370) == clip-path-viewBox-1c.html clip-path-geometryBox-1-ref.html
fuzzy-if(winWidget,9,98) == clip-path-geometryBox-2.html clip-path-geometryBox-2-ref.html
default-preferences

View File

@ -760,13 +760,7 @@ pref("gfx.font_rendering.opentype_svg.enabled", true);
// comma separated list of backends to use in order of preference
// e.g., pref("gfx.canvas.azure.backends", "direct2d,skia,cairo");
pref("gfx.canvas.azure.backends", "direct2d1.1,skia,cairo");
#ifdef NIGHTLY_BUILD
pref("gfx.content.azure.backends", "direct2d1.1,skia,cairo");
#else
pref("gfx.content.azure.backends", "direct2d1.1,cairo");
#endif
#else
#ifdef XP_MACOSX
pref("gfx.content.azure.backends", "skia");

View File

@ -0,0 +1,7 @@
[dir-isolation-002a.html]
type: reftest
expected:
if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL

View File

@ -0,0 +1,8 @@
[dir-isolation-002b.html]
type: reftest
expected:
if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL

View File

@ -0,0 +1,8 @@
[dir-isolation-002c.html]
type: reftest
expected:
if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL

View File

@ -0,0 +1,7 @@
[dir-isolation-006a.html]
type: reftest
expected:
if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL

View File

@ -0,0 +1,8 @@
[dir-isolation-006b.html]
type: reftest
expected:
if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL

View File

@ -0,0 +1,8 @@
[dir-isolation-006c.html]
type: reftest
expected:
if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL

View File

@ -0,0 +1,8 @@
[dir-isolation-009a.html]
type: reftest
expected:
if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL

View File

@ -0,0 +1,8 @@
[dir-isolation-009b.html]
type: reftest
expected:
if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL

View File

@ -0,0 +1,7 @@
[dir-isolation-009c.html]
type: reftest
expected:
if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL