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

Auto merge of #6835 - metajack:cssparserup, r=Ms2ger

Browse source 
Update to latest rust-cssparser.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6835)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-07-30 17:24:38 -06:00
commit e458dca65b
16 changed files with 129 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/wpt/metadata-css/css21_dev/html4/border-bottom-color-030.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-bottom-color-030.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/border-left-color-030.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-left-color-030.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/border-right-color-030.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-right-color-030.htm]
type: reftest
expected: FAIL

3
tests/wpt/metadata-css/css21_dev/html4/border-top-color-030.htm.ini Normal file
View file

@ -0,0 +1,3 @@
[border-top-color-030.htm]
type: reftest
expected: FAIL

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

@ -28856,8 +28856,30 @@
]
},
"local_changes": {
"deleted": [],
"items": {},
"deleted": [
"shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002.html",
"shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006.html",
"shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004.html",
"shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003.html",
"2dcontext/transformations/canvas_transformations_reset_001.htm",
"shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005.html"
],
"items": {
"testharness": {
"2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html": [
{
"path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html",
"url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html"
}
],
"2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html": [
{
"path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html",
"url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html"
}
]
}
},
"reftest_nodes": {}
},
"reftest_nodes": {

12
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -63,18 +63,6 @@
"url": "/_mozilla/css/absolute_hypothetical_float.html"
}
],
"css/empty_pseudo_selector.html": [
{
"path": "css/empty_pseudo_selector.html",
"references": [
[
"/_mozilla/css/empty_pseudo_selector_ref.html",
"=="
]
],
"url": "/_mozilla/css/empty_pseudo_selector.html"
}
],
"css/class-namespaces.html": [
{
"path": "css/class-namespaces.html",

31
tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html Normal file
View file

@ -0,0 +1,31 @@
<!DOCTYPE html>
<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
<title>Canvas test: 2d.fillStyle.parse.hex4</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/common/canvas-tests.js"></script>
<link rel="stylesheet" href="/common/canvas-tests.css">
<body class="show_output">
<h1>2d.fillStyle.parse.hex4</h1>
<p class="desc"></p>
<p class="notes">
<p class="output">Actual output:</p>
<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
<p class="output expectedtext">Expected output:<p><img src="2d.fillStyle.parse.hex4.png" class="output expected" id="expected" alt="">
<ul id="d"></ul>
<script>
var t = async_test("");
_addTest(function(canvas, ctx) {
ctx.fillStyle = '#f00';
ctx.fillStyle = '#0f0f';
ctx.fillRect(0, 0, 100, 50);
_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
});
</script>

BIN
tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 205 B

31
tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html Normal file
View file

@ -0,0 +1,31 @@
<!DOCTYPE html>
<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
<title>Canvas test: 2d.fillStyle.parse.hex8</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/common/canvas-tests.js"></script>
<link rel="stylesheet" href="/common/canvas-tests.css">
<body class="show_output">
<h1>2d.fillStyle.parse.hex8</h1>
<p class="desc"></p>
<p class="notes">
<p class="output">Actual output:</p>
<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
<p class="output expectedtext">Expected output:<p><img src="2d.fillStyle.parse.hex8.png" class="output expected" id="expected" alt="">
<ul id="d"></ul>
<script>
var t = async_test("");
_addTest(function(canvas, ctx) {
ctx.fillStyle = '#f00';
ctx.fillStyle = '#00ff00ff';
ctx.fillRect(0, 0, 100, 50);
_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
});
</script>

BIN
tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex8.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 205 B

2
tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html
View file

@ -21,7 +21,7 @@ _addTest(function(canvas, ctx) {
ctx.fillStyle = '#0f0';
try { ctx.fillStyle = '#ff00'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
try { ctx.fillStyle = '#fg00'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
ctx.fillRect(0, 0, 100, 50);
_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");

2
tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html
View file

@ -21,7 +21,7 @@ _addTest(function(canvas, ctx) {
ctx.fillStyle = '#0f0';
try { ctx.fillStyle = '#ff0000ff'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
try { ctx.fillStyle = '#fg0000ff'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
ctx.fillRect(0, 0, 100, 50);
_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");

6
tests/wpt/web-platform-tests/2dcontext/tools/tests2d.yaml
View file

@ -1329,7 +1329,9 @@
for name, string, r,g,b,a, notes in [
('html4', 'limE', 0,255,0,255, ""),
('hex3', '#0f0', 0,255,0,255, ""),
('hex4', '#0f0f', 0,255,0,255, ""),
('hex6', '#00fF00', 0,255,0,255, ""),
('hex8', '#00ff00ff', 0,255,0,255, ""),
('rgb-num', 'rgb(0,255,0)', 0,255,0,255, ""),
('rgb-clamp-1', 'rgb(-1000, 1000, -1000)', 0,255,0,255, 'Assumes colours are clamped to [0,255].'),
('rgb-clamp-2', 'rgb(-200%, 200%, -200%)', 0,255,0,255, 'Assumes colours are clamped to [0,255].'),
@ -1397,11 +1399,11 @@
('hex1', '#f'),
('hex2', '#f0'),
('hex3', '#g00'),
('hex4', '#ff00'),
('hex4', '#fg00'),
('hex5', '#ff000'),
('hex6', '#fg0000'),
('hex7', '#ff0000f'),
('hex8', '#ff0000ff'),
('hex8', '#fg0000ff'),
('rgb-1', 'rgb(255.0, 0, 0)'),
('rgb-2', 'rgb(255, 0.0, 0)'),
('rgb-3', 'rgb(255.0, 0, 0,)'),