Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #10727 - jdm:canvas_panic, r=pcwalton

Browse source 
Use DOM width/height for canvas display list item.

Fixes #10705.

r? @glennw

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10727)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-21 20:50:27 -07:00
commit 0e0e902edd
9 changed files with 81 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

32
tests/wpt/metadata/MANIFEST.json
View file

@ -35214,8 +35214,36 @@
"local_changes": {
"deleted": [],
"deleted_reftests": {},
"items": {},
"reftest_nodes": {}
"items": {
"reftest": {
"html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale.html": [
{
"path": "html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale.html",
"references": [
[
"/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale_ref.html",
"=="
]
],
"url": "/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale.html"
}
]
}
},
"reftest_nodes": {
"html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale.html": [
{
"path": "html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale.html",
"references": [
[
"/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale_ref.html",
"=="
]
],
"url": "/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale.html"
}
]
}
},
"reftest_nodes": {
"2dcontext/building-paths/canvas_complexshapes_arcto_001.htm": [

2
tests/wpt/metadata/webgl/conformance-1.0.3/conformance/reading/read-pixels-test.html.ini
View file

@ -1,3 +1,3 @@
[read-pixels-test.html]
type: testharness
expected: CRASH
expected: TIMEOUT

2
tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/state-uneffected-after-compositing.html.ini
View file

@ -1,6 +1,6 @@
[state-uneffected-after-compositing.html]
type: testharness
expected: CRASH
expected: TIMEOUT
[WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
expected: FAIL

2
tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-size-cube-maps.html.ini
View file

@ -1,3 +1,3 @@
[texture-size-cube-maps.html]
type: testharness
expected: CRASH
expected: TIMEOUT

4
tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-size-limit.html.ini
View file

@ -1,8 +1,6 @@
[texture-size-limit.html]
type: testharness
expected:
if os == "linux": CRASH
if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
expected: TIMEOUT
[WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
expected: FAIL

4
tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-size.html.ini
View file

@ -1,8 +1,6 @@
[texture-size.html]
type: testharness
expected:
if os == "linux": CRASH
if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
expected: TIMEOUT
[WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
expected: FAIL

23
tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale.html Normal file
View file

@ -0,0 +1,23 @@
<!doctype html>
<meta charset="utf-8">
<title>Verify that canvases are scaled up to their computed size</title>
<link rel="match" href="canvas_scale_ref.html">
<style>
canvas {
width: 20px;
height: 20px;
}
div {
line-height: 0;
}
</style>
<div><canvas width="16" height="16" data-color="#FF00FF"></canvas><canvas width="16" height="16" data-color="#00FF00"></canvas></div>
<div><canvas width="16" height="16" data-color="#0000FF"></canvas><canvas width="16" height="16" data-color="#FF00FF"></canvas></div>
<script>
var canvases = document.getElementsByTagName('canvas');
for (var i = 0; i < canvases.length; i++) {
var ctx = canvases[i].getContext('2d');
ctx.fillStyle = canvases[i].getAttribute('data-color');
ctx.fillRect(0, 0, 16, 16);
}
</script>

14
tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale_ref.html Normal file
View file

@ -0,0 +1,14 @@
<!doctype html>
<meta charset="utf-8">
<style>
span {
display: inline-block;
width: 20px;
height: 20px;
}
div {
line-height: 0;
}
</style>
<div><span style="background-color: #FF00FF"></span><span style="background-color: #00FF00"></span></div>
<div><span style="background-color: #0000FF"></span><span style="background-color: #FF00FF"></span></div>