Bug 1244754 - part 2 - enable Skia canvas on Linux and fix web-platform-tests/reftests. r=jrmuizel
authorLee Salzman <lsalzman@mozilla.com>
Wed, 23 Mar 2016 14:21:04 -0400
changeset 290167 180f3f0494a791bb897c458d6b62c0c006f3fedc
parent 290166 a37ac3dbec9f5aa33d4e3990e49ce0d92a9cdaa5
child 290168 337789a5f9c60b5cc8400369236f342a04e4c974
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1244754
milestone48.0a1
Bug 1244754 - part 2 - enable Skia canvas on Linux and fix web-platform-tests/reftests. r=jrmuizel
dom/canvas/test/reftest/reftest.list
modules/libpref/init/all.js
testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html.ini
testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html.ini
testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html.ini
testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.equal.html.ini
testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.outside3.html.ini
testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.touch1.html.ini
testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.touch3.html.ini
testing/web-platform/meta/2dcontext/path-objects/2d.path.arc.selfintersect.1.html.ini
testing/web-platform/meta/2dcontext/path-objects/2d.path.arc.shape.3.html.ini
testing/web-platform/meta/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html.ini
testing/web-platform/meta/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html.ini
testing/web-platform/meta/2dcontext/path-objects/2d.path.rect.selfintersect.html.ini
testing/web-platform/meta/2dcontext/path-objects/2d.path.rect.zero.6.html.ini
testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.closed.html.ini
testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.rect.html.ini
--- a/dom/canvas/test/reftest/reftest.list
+++ b/dom/canvas/test/reftest/reftest.list
@@ -148,14 +148,14 @@ skip-if(!winWidget) pref(webgl.disable-a
 # Do we correctly handle multiple clip paths?
 != clip-multiple-paths.html clip-multiple-paths-badref.html
 
 # Bug 815648
 == stroketext-shadow.html stroketext-shadow-ref.html
 
 # focus rings
 pref(canvas.focusring.enabled,true) skip-if(B2G) skip-if(cocoaWidget) skip-if(winWidget) needs-focus == drawFocusIfNeeded.html drawFocusIfNeeded-ref.html
-pref(canvas.customfocusring.enabled,true) skip-if(B2G) skip-if(cocoaWidget) skip-if(Android) skip-if(winWidget) needs-focus == drawCustomFocusRing.html drawCustomFocusRing-ref.html
+pref(canvas.customfocusring.enabled,true) skip-if(B2G) skip-if(cocoaWidget) skip-if(Android) skip-if(winWidget) fuzzy-if(azureSkia,64,410) needs-focus == drawCustomFocusRing.html drawCustomFocusRing-ref.html
 
 # Check that captureStream() displays in a local video element
 == capturestream.html wrapper.html?green.png
 
 fuzzy-if(azureSkiaGL,1,2) fuzzy-if(Android,3,40) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),1,1) == 1177726-text-stroke-bounds.html 1177726-text-stroke-bounds-ref.html
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -714,17 +714,17 @@ pref("gfx.canvas.azure.backends", "direc
 pref("gfx.content.azure.backends", "direct2d1.1,cairo");
 #else
 #ifdef XP_MACOSX
 pref("gfx.content.azure.backends", "skia,cg");
 pref("gfx.canvas.azure.backends", "skia");
 // Accelerated cg canvas where available (10.7+)
 pref("gfx.canvas.azure.accelerated", true);
 #else
-pref("gfx.canvas.azure.backends", "cairo");
+pref("gfx.canvas.azure.backends", "skia");
 pref("gfx.content.azure.backends", "cairo");
 #endif
 #endif
 
 pref("gfx.work-around-driver-bugs", true);
 pref("gfx.prefer-mesa-llvmpipe", false);
 
 pref("gfx.draw-color-bars", false);
deleted file mode 100644
--- a/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[2d.gradient.radial.cone.behind.html]
-  type: testharness
-  [Canvas test: 2d.gradient.radial.cone.behind]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[2d.gradient.radial.cone.beside.html]
-  type: testharness
-  [Canvas test: 2d.gradient.radial.cone.beside]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[2d.gradient.radial.cone.shape2.html]
-  type: testharness
-  [Canvas test: 2d.gradient.radial.cone.shape2]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.equal.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[2d.gradient.radial.equal.html]
-  type: testharness
-  [Canvas test: 2d.gradient.radial.equal]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
-
--- a/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.outside3.html.ini
+++ b/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.outside3.html.ini
@@ -2,9 +2,10 @@
   type: testharness
   [Canvas test: 2d.gradient.radial.outside3]
     expected:
       if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
       if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
       if os == "mac": FAIL
+      if os == "linux": FAIL
 
deleted file mode 100644
--- a/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.touch1.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[2d.gradient.radial.touch1.html]
-  type: testharness
-  [Canvas test: 2d.gradient.radial.touch1]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.touch3.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[2d.gradient.radial.touch3.html]
-  type: testharness
-  [Canvas test: 2d.gradient.radial.touch3]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
-
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.arc.selfintersect.1.html.ini
+++ b/testing/web-platform/meta/2dcontext/path-objects/2d.path.arc.selfintersect.1.html.ini
@@ -1,10 +1,8 @@
 [2d.path.arc.selfintersect.1.html]
   type: testharness
   [arc() with lineWidth > 2*radius is drawn sensibly]
     expected:
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
       if (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
       if not debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
 
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.arc.shape.3.html.ini
+++ b/testing/web-platform/meta/2dcontext/path-objects/2d.path.arc.shape.3.html.ini
@@ -1,8 +1,6 @@
 [2d.path.arc.shape.3.html]
   type: testharness
   [arc() from 0 to -pi/2 does not draw anything in the wrong quadrant]
     expected:
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
       if (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
 
deleted file mode 100644
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[2d.path.quadraticCurveTo.ensuresubpath.1.html]
-  type: testharness
-  [If there is no subpath, the first control point is added (and nothing is drawn up to it)]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[2d.path.quadraticCurveTo.ensuresubpath.2.html]
-  type: testharness
-  [If there is no subpath, the first control point is added]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.rect.selfintersect.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[2d.path.rect.selfintersect.html]
-  type: testharness
-  [Canvas test: 2d.path.rect.selfintersect]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.rect.zero.6.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[2d.path.rect.zero.6.html]
-  type: testharness
-  [Canvas test: 2d.path.rect.zero.6]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
-      if (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
-
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.closed.html.ini
+++ b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.closed.html.ini
@@ -1,13 +1,9 @@
 [2d.path.stroke.prune.closed.html]
   type: testharness
   [Zero-length line segments from closed paths are removed before stroking]
     expected:
-      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
       if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
       if not debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
 
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.rect.html.ini
+++ b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.rect.html.ini
@@ -1,13 +1,9 @@
 [2d.path.stroke.prune.rect.html]
   type: testharness
   [Zero-length line segments from rect and strokeRect are removed before stroking]
     expected:
-      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
       if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
       if not debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL