aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-02-22 11:48:46 -0700
committerbors-servo <metajack+bors@gmail.com>2015-02-22 11:48:46 -0700
commit287f390c4a56dd8c5960df699d45653227b25d6f (patch)
tree12503aa177afda01e92156174e17b41a948fa284 /tests
parent3ea09bf2ea8db621107abbc8b358f1c0ce0ffea4 (diff)
parent325400dce41486ca9bdb4fa8ea07236520e86a50 (diff)
downloadservo-287f390c4a56dd8c5960df699d45653227b25d6f.tar.gz
servo-287f390c4a56dd8c5960df699d45653227b25d6f.zip
auto merge of #5020 : jdm/servo/canvas, r=jdm
Rebase of #4639.
Diffstat (limited to 'tests')
-rw-r--r--tests/content/test_interfaces.html1
-rw-r--r--tests/wpt/metadata/html/dom/interfaces.html.ini57
-rw-r--r--tests/wpt/metadata/html/semantics/embedded-content/the-canvas-element/initial.colour.html.ini5
-rw-r--r--tests/wpt/metadata/workers/semantics/interface-objects/001.worker.ini3
4 files changed, 1 insertions, 65 deletions
diff --git a/tests/content/test_interfaces.html b/tests/content/test_interfaces.html
index fe74bcacb54..d1cc96622cd 100644
--- a/tests/content/test_interfaces.html
+++ b/tests/content/test_interfaces.html
@@ -144,6 +144,7 @@ var interfaceNamesInGlobalScope = [
"HTMLUListElement",
"HTMLUnknownElement",
"HTMLVideoElement",
+ "ImageData",
"KeyboardEvent",
"Location",
"MessageEvent",
diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini
index 2cf84f4a77f..8795084ec53 100644
--- a/tests/wpt/metadata/html/dom/interfaces.html.ini
+++ b/tests/wpt/metadata/html/dom/interfaces.html.ini
@@ -7107,21 +7107,12 @@
[CanvasRenderingContext2D interface: operation removeHitRegion(DOMString)]
expected: FAIL
- [CanvasRenderingContext2D interface: operation createImageData(double,double)]
- expected: FAIL
-
[CanvasRenderingContext2D interface: operation createImageData(ImageData)]
expected: FAIL
- [CanvasRenderingContext2D interface: operation getImageData(double,double,double,double)]
- expected: FAIL
-
[CanvasRenderingContext2D interface: operation putImageData(ImageData,double,double)]
expected: FAIL
- [CanvasRenderingContext2D interface: operation putImageData(ImageData,double,double,double,double,double,double)]
- expected: FAIL
-
[CanvasRenderingContext2D interface: attribute lineWidth]
expected: FAIL
@@ -7425,36 +7416,6 @@
[CanvasRenderingContext2D interface: calling removeHitRegion(DOMString) on document.createElement("canvas").getContext("2d") with too few arguments must throw TypeError]
expected: FAIL
- [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "createImageData" with the proper type (54)]
- expected: FAIL
-
- [CanvasRenderingContext2D interface: calling createImageData(double,double) on document.createElement("canvas").getContext("2d") with too few arguments must throw TypeError]
- expected: FAIL
-
- [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "createImageData" with the proper type (55)]
- expected: FAIL
-
- [CanvasRenderingContext2D interface: calling createImageData(ImageData) on document.createElement("canvas").getContext("2d") with too few arguments must throw TypeError]
- expected: FAIL
-
- [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "getImageData" with the proper type (56)]
- expected: FAIL
-
- [CanvasRenderingContext2D interface: calling getImageData(double,double,double,double) on document.createElement("canvas").getContext("2d") with too few arguments must throw TypeError]
- expected: FAIL
-
- [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "putImageData" with the proper type (57)]
- expected: FAIL
-
- [CanvasRenderingContext2D interface: calling putImageData(ImageData,double,double) on document.createElement("canvas").getContext("2d") with too few arguments must throw TypeError]
- expected: FAIL
-
- [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "putImageData" with the proper type (58)]
- expected: FAIL
-
- [CanvasRenderingContext2D interface: calling putImageData(ImageData,double,double,double,double,double,double) on document.createElement("canvas").getContext("2d") with too few arguments must throw TypeError]
- expected: FAIL
-
[CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "lineWidth" with the proper type (59)]
expected: FAIL
@@ -7626,27 +7587,9 @@
[TextMetrics interface: attribute ideographicBaseline]
expected: FAIL
- [ImageData interface: existence and properties of interface object]
- expected: FAIL
-
[ImageData interface object length]
expected: FAIL
- [ImageData interface: existence and properties of interface prototype object]
- expected: FAIL
-
- [ImageData interface: existence and properties of interface prototype object\'s "constructor" property]
- expected: FAIL
-
- [ImageData interface: attribute width]
- expected: FAIL
-
- [ImageData interface: attribute height]
- expected: FAIL
-
- [ImageData interface: attribute data]
- expected: FAIL
-
[DrawingStyle interface: existence and properties of interface object]
expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-canvas-element/initial.colour.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-canvas-element/initial.colour.html.ini
deleted file mode 100644
index b553b71fa1e..00000000000
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-canvas-element/initial.colour.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[initial.colour.html]
- type: testharness
- [Initial state is transparent black]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/workers/semantics/interface-objects/001.worker.ini b/tests/wpt/metadata/workers/semantics/interface-objects/001.worker.ini
index 1aecda72c8f..b33ef301d9d 100644
--- a/tests/wpt/metadata/workers/semantics/interface-objects/001.worker.ini
+++ b/tests/wpt/metadata/workers/semantics/interface-objects/001.worker.ini
@@ -9,9 +9,6 @@
[The MessageChannel interface object should be exposed.]
expected: FAIL
- [The ImageData interface object should be exposed.]
- expected: FAIL
-
[The FileList interface object should be exposed.]
expected: FAIL