Backed out 2 changesets (bug 1304539) for Windows unaccelerated reftest failures a=backout
authorWes Kocher <wkocher@mozilla.com>
Thu, 29 Sep 2016 11:55:08 -0700
changeset 315804 37580f7e092f
parent 315803 c8c685a95ab0
child 315805 b9fddae1ada2
push id82278
push userkwierso@gmail.com
push dateThu, 29 Sep 2016 18:55:27 +0000
treeherdermozilla-inbound@37580f7e092f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1304539
milestone52.0a1
backs outfbfe71842bb7
f205f28cbcf3
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 2 changesets (bug 1304539) for Windows unaccelerated reftest failures a=backout Backed out changeset fbfe71842bb7 (bug 1304539) Backed out changeset f205f28cbcf3 (bug 1304539)
dom/canvas/CanvasRenderingContext2D.cpp
dom/canvas/test/reftest/filters/fillText-with-filter-grayscale-1-ref.html
dom/canvas/test/reftest/filters/fillText-with-filter-grayscale-1.html
dom/canvas/test/reftest/filters/fillText-with-filter-grayscale-2-ref.html
dom/canvas/test/reftest/filters/fillText-with-filter-grayscale-2.html
dom/canvas/test/reftest/filters/fillText-with-filter-opacity-1-ref.html
dom/canvas/test/reftest/filters/fillText-with-filter-opacity-1.html
dom/canvas/test/reftest/filters/fillText-with-filter-opacity-2-ref.html
dom/canvas/test/reftest/filters/fillText-with-filter-opacity-2.html
dom/canvas/test/reftest/filters/fillText-with-shadow-1.html
dom/canvas/test/reftest/filters/fillText-with-shadow-2.html
dom/canvas/test/reftest/filters/fillText-without-shadow-1-ref.html
dom/canvas/test/reftest/filters/fillText-without-shadow-2-ref.html
dom/canvas/test/reftest/filters/reftest.list
dom/canvas/test/reftest/filters/strokeText-with-filter-grayscale-1-ref.html
dom/canvas/test/reftest/filters/strokeText-with-filter-grayscale-1.html
dom/canvas/test/reftest/filters/strokeText-with-filter-grayscale-2-ref.html
dom/canvas/test/reftest/filters/strokeText-with-filter-grayscale-2.html
dom/canvas/test/reftest/filters/strokeText-with-shadow-1.html
dom/canvas/test/reftest/filters/strokeText-with-shadow-2.html
dom/canvas/test/reftest/filters/strokeText-without-shadow-1-ref.html
dom/canvas/test/reftest/filters/strokeText-without-shadow-2-ref.html
--- a/dom/canvas/CanvasRenderingContext2D.cpp
+++ b/dom/canvas/CanvasRenderingContext2D.cpp
@@ -3975,19 +3975,18 @@ struct MOZ_STACK_CLASS CanvasBidiProcess
 
     // Defer the tasks to gfxTextRun which will handle color/svg-in-ot fonts
     // appropriately.
     StrokeOptions strokeOpts;
     DrawOptions drawOpts;
     Style style = (mOp == CanvasRenderingContext2D::TextDrawOperation::FILL)
                     ? Style::FILL
                     : Style::STROKE;
-    AdjustedTarget target(mCtx);
     RefPtr<gfxContext> thebes =
-      gfxContext::CreatePreservingTransformOrNull(target);
+      gfxContext::CreatePreservingTransformOrNull(mCtx->mTarget);
     gfxTextRun::DrawParams params(thebes);
 
     if (mState->StyleIsColor(style)) { // Color
       nscolor fontColor = mState->colorStyles[style];
       if (style == Style::FILL) {
         params.context->SetColor(Color::FromABGR(fontColor));
       } else {
         params.textStrokeColor = fontColor;
deleted file mode 100644
--- a/dom/canvas/test/reftest/filters/fillText-with-filter-grayscale-1-ref.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<canvas id="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById("canvas");
-var ctx = canvas.getContext("2d");
-ctx.fillStyle = "rgb(85,85,85)";
-ctx.font = "20px serif";
-ctx.fillText("Hello world", 0, 50);
-</script>
-</body></html>
deleted file mode 100644
--- a/dom/canvas/test/reftest/filters/fillText-with-filter-grayscale-1.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<canvas id="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById("canvas");
-var ctx = canvas.getContext("2d");
-ctx.fillStyle = "rgb(85,85,85)";
-ctx.filter = "grayscale(100%)";
-ctx.font = "20px serif";
-ctx.fillText("Hello world", 0, 50);
-</script>
-</body></html>
deleted file mode 100644
--- a/dom/canvas/test/reftest/filters/fillText-with-filter-grayscale-2-ref.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<canvas id="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById("canvas");
-var ctx = canvas.getContext("2d");
-ctx.globalAlpha = 0.5;
-ctx.fillStyle = "rgb(85,85,85)";
-ctx.font = "20px serif";
-ctx.fillText("Hello world", 0, 50);
-</script>
-</body></html>
deleted file mode 100644
--- a/dom/canvas/test/reftest/filters/fillText-with-filter-grayscale-2.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<canvas id="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById("canvas");
-var ctx = canvas.getContext("2d");
-ctx.globalAlpha = 0.5;
-ctx.fillStyle = "rgb(85,85,85)";
-ctx.filter = "grayscale(100%)";
-ctx.font = "20px serif";
-ctx.fillText("Hello world", 0, 50);
-</script>
-</body></html>
deleted file mode 100644
--- a/dom/canvas/test/reftest/filters/fillText-with-filter-opacity-1-ref.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<canvas id="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById("canvas");
-var ctx = canvas.getContext("2d");
-ctx.globalAlpha = 0.5;
-ctx.fillStyle = "rgb(0,128,0)";
-ctx.font = "20px serif";
-ctx.fillText("Hello world", 0, 50);
-</script>
-</body></html>
deleted file mode 100644
--- a/dom/canvas/test/reftest/filters/fillText-with-filter-opacity-1.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<canvas id="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById("canvas");
-var ctx = canvas.getContext("2d");
-ctx.fillStyle = "rgb(0,128,0)";
-ctx.filter = "opacity(0.5)";
-ctx.font = "20px serif";
-ctx.fillText("Hello world", 0, 50);
-</script>
-</body></html>
deleted file mode 100644
--- a/dom/canvas/test/reftest/filters/fillText-with-filter-opacity-2-ref.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<canvas id="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById("canvas");
-var ctx = canvas.getContext("2d");
-ctx.globalAlpha = 0.25;
-ctx.fillStyle = "rgb(0,255,0)";
-ctx.font = "20px serif";
-ctx.fillText("Hello world", 0, 50);
-</script>
-</body></html>
deleted file mode 100644
--- a/dom/canvas/test/reftest/filters/fillText-with-filter-opacity-2.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<canvas id="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById("canvas");
-var ctx = canvas.getContext("2d");
-ctx.globalAlpha = 0.5;
-ctx.fillStyle = "rgb(0,255,0)";
-ctx.filter = "opacity(0.5)";
-ctx.font = "20px serif";
-ctx.fillText("Hello world", 0, 50);
-</script>
-</body></html>
deleted file mode 100644
--- a/dom/canvas/test/reftest/filters/fillText-with-shadow-1.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<canvas id="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById("canvas");
-var ctx = canvas.getContext("2d");
-ctx.shadowColor = "black";
-ctx.shadowBlur = 2;
-ctx.fillStyle = "green";
-ctx.font = "20px serif";
-ctx.fillText("Hello world", 0, 50);
-</script>
-</body></html>
deleted file mode 100644
--- a/dom/canvas/test/reftest/filters/fillText-with-shadow-2.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<canvas id="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById("canvas");
-var ctx = canvas.getContext("2d");
-ctx.globalAlpha = 0.5;
-ctx.shadowColor = "black";
-ctx.shadowBlur = 2;
-ctx.fillStyle = "green";
-ctx.font = "20px serif";
-ctx.fillText("Hello world", 0, 50);
-</script>
-</body></html>
deleted file mode 100644
--- a/dom/canvas/test/reftest/filters/fillText-without-shadow-1-ref.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<canvas id="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById("canvas");
-var ctx = canvas.getContext("2d");
-ctx.fillStyle = "green";
-ctx.font = "20px serif";
-ctx.fillText("Hello world", 0, 50);
-</script>
-</body></html>
deleted file mode 100644
--- a/dom/canvas/test/reftest/filters/fillText-without-shadow-2-ref.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<canvas id="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById("canvas");
-var ctx = canvas.getContext("2d");
-ctx.globalAlpha = 0.5;
-ctx.fillStyle = "green";
-ctx.font = "20px serif";
-ctx.fillText("Hello world", 0, 50);
-</script>
-</body></html>
--- a/dom/canvas/test/reftest/filters/reftest.list
+++ b/dom/canvas/test/reftest/filters/reftest.list
@@ -13,18 +13,8 @@ fuzzy-if(azureSkia,1,1500) == global-alp
 == svg-bbox.html svg-bbox-ref.html
 == svg-inline.html ref.html
 == svg-liveness.html ref.html
 == svg-off-screen.html ref.html
 == units.html ref.html
 == units-em.html ref.html
 == units-ex.html ref.html
 == units-off-screen.html ref.html
-fuzzy(1,700) == fillText-with-filter-opacity-1.html fillText-with-filter-opacity-1-ref.html
-fuzzy(1,300) == fillText-with-filter-opacity-2.html fillText-with-filter-opacity-2-ref.html
-fuzzy(1,400) == strokeText-with-filter-grayscale-1.html strokeText-with-filter-grayscale-1-ref.html
-fuzzy(1,400) == strokeText-with-filter-grayscale-2.html strokeText-with-filter-grayscale-2-ref.html
-!= fillText-with-shadow-1.html fillText-without-shadow-1-ref.html
-!= fillText-with-shadow-2.html fillText-without-shadow-2-ref.html
-fuzzy(1,200) == fillText-with-filter-grayscale-1.html fillText-with-filter-grayscale-1-ref.html
-fuzzy(1,200) == fillText-with-filter-grayscale-2.html fillText-with-filter-grayscale-2-ref.html
-!= strokeText-with-shadow-1.html strokeText-without-shadow-1-ref.html
-!= strokeText-with-shadow-2.html strokeText-without-shadow-2-ref.html
deleted file mode 100644
--- a/dom/canvas/test/reftest/filters/strokeText-with-filter-grayscale-1-ref.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<canvas id="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById("canvas");
-var ctx = canvas.getContext("2d");
-ctx.strokeStyle = "rgb(85,85,85)";
-ctx.font = "20px serif";
-ctx.strokeText("Hello world", 0, 50);
-</script>
-</body></html>
deleted file mode 100644
--- a/dom/canvas/test/reftest/filters/strokeText-with-filter-grayscale-1.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<canvas id="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById("canvas");
-var ctx = canvas.getContext("2d");
-ctx.strokeStyle = "rgb(85,85,85)";
-ctx.filter = "grayscale(100%)";
-ctx.font = "20px serif";
-ctx.strokeText("Hello world", 0, 50);
-</script>
-</body></html>
deleted file mode 100644
--- a/dom/canvas/test/reftest/filters/strokeText-with-filter-grayscale-2-ref.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<canvas id="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById("canvas");
-var ctx = canvas.getContext("2d");
-ctx.globalAlpha = 0.5;
-ctx.strokeStyle = "rgb(85,85,85)";
-ctx.font = "20px serif";
-ctx.strokeText("Hello world", 0, 50);
-</script>
-</body></html>
deleted file mode 100644
--- a/dom/canvas/test/reftest/filters/strokeText-with-filter-grayscale-2.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<canvas id="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById("canvas");
-var ctx = canvas.getContext("2d");
-ctx.globalAlpha = 0.5;
-ctx.strokeStyle = "rgb(85,85,85)";
-ctx.filter = "grayscale(100%)";
-ctx.font = "20px serif";
-ctx.strokeText("Hello world", 0, 50);
-</script>
-</body></html>
deleted file mode 100644
--- a/dom/canvas/test/reftest/filters/strokeText-with-shadow-1.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<canvas id="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById("canvas");
-var ctx = canvas.getContext("2d");
-ctx.shadowColor = "black";
-ctx.shadowBlur = 2;
-ctx.strokeStyle = "green";
-ctx.font = "20px serif";
-ctx.strokeText("Hello world", 0, 50);
-</script>
-</body></html>
deleted file mode 100644
--- a/dom/canvas/test/reftest/filters/strokeText-with-shadow-2.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<canvas id="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById("canvas");
-var ctx = canvas.getContext("2d");
-ctx.globalAlpha = 0.5;
-ctx.shadowColor = "black";
-ctx.shadowBlur = 2;
-ctx.strokeStyle = "green";
-ctx.font = "20px serif";
-ctx.strokeText("Hello world", 0, 50);
-</script>
-</body></html>
deleted file mode 100644
--- a/dom/canvas/test/reftest/filters/strokeText-without-shadow-1-ref.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<canvas id="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById("canvas");
-var ctx = canvas.getContext("2d");
-ctx.strokeStyle = "green";
-ctx.font = "20px serif";
-ctx.strokeText("Hello world", 0, 50);
-</script>
-</body></html>
deleted file mode 100644
--- a/dom/canvas/test/reftest/filters/strokeText-without-shadow-2-ref.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<canvas id="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById("canvas");
-var ctx = canvas.getContext("2d");
-ctx.globalAlpha = 0.5;
-ctx.strokeStyle = "green";
-ctx.font = "20px serif";
-ctx.strokeText("Hello world", 0, 50);
-</script>
-</body></html>