Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to latest rust-cssparser. #6835

Merged
merged 1 commit into from Jul 31, 2015
+129 −43
Merged

Update to latest rust-cssparser. #6835

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Loading status checks…

Update to latest rust-cssparser. 

This also updates wpt tests for new CSS Level 4 color parsing, and
disables the relevant CSS tests until they can be updated (tracked
by #6856).
  • Loading branch information
@metajack
metajack committed Jul 30, 2015
commit 154b5fd6da3747a4280a4def72c03ea28ee09df1
18 components/servo/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more.

16 ports/cef/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more.

16 ports/gonk/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more.

3 tests/wpt/metadata-css/css21_dev/html4/border-bottom-color-030.htm.ini
View file
Open in desktop
@@ -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
View file
Open in desktop
@@ -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
View file
Open in desktop
@@ -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
View file
Open in desktop
@@ -0,0 +1,3 @@
[border-top-color-030.htm]
type: reftest
expected: FAIL
26 tests/wpt/metadata/MANIFEST.json
View file
Open in desktop
]
},
"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
Open in desktop
@@ -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
View file
Open in desktop
@@ -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 +205 Bytes ...web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex4.png
View file
Open in desktop
Binary file not shown.
31 tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html
View file
Open in desktop
@@ -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 +205 Bytes ...web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex8.png
View file
Open in desktop
Binary file not shown.
2 .../web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html
View file
Open in desktop
@@ -21,7 +21,7 @@ <h1>2d.fillStyle.parse.invalid.hex4</h1>


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 .../web-platform-tests/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html
View file
Open in desktop
@@ -21,7 +21,7 @@ <h1>2d.fillStyle.parse.invalid.hex8</h1>


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
Open in desktop
@@ -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,)'),
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.