Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into a-rellist
Browse files Browse the repository at this point in the history
  • Loading branch information
@gsnedders
gsnedders committed Jul 3, 2015
2 parents b0f9256 + cb727b8 commit 57272a6
Show file tree
Hide file tree
Showing 15,862 changed files with 385,264 additions and 528,156 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
9 changes: 9 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,11 @@
*#
*.py[co]
*.sw[po]
*~
MANIFEST.json
\#*
_certs
config.json
node_modules
scratch
testharness_runner.html
6 changes: 5 additions & 1 deletion .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[submodule "resources"]
path = resources
url = git://github.com/w3c/testharness.js.git
url = https://github.com/w3c/testharness.js.git
ignore = dirty
[submodule "tools"]
path = tools
url = https://github.com/w3c/wpt-tools.git
2 changes: 0 additions & 2 deletions .htaccess
View file

This file was deleted.

7 changes: 7 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
language: python
python:
- "2.7"
before_install:
- git submodule update --init --recursive
# command to run tests, e.g. python setup.py test
script: ./lint
Binary file added 2dcontext/2x2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions 2dcontext/building-paths/canvas_complexshapes_arcto_001-ref.htm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!doctype HTML>
<html>
<head>
<title>HTML5 Canvas Test: arcTo() adds to subpath if same point</title>
<link rel="author" title="Microsoft" href="http://www.microsoft.com" />
</head>
<body>
<p>Description: If x1,y1 and x2,y2 are the same point, then arcTo must add x1,y1 to the subpath, and connect that point to x0,y0 with a straight line.</p>
<div><img src="/images/canvas-line.png" alt="line" /></div>
</body>
</html>
52 changes: 26 additions & 26 deletions 2dcontext/building-paths/canvas_complexshapes_arcto_001.htm
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
<!doctype HTML>
<html>
<head>
<title>HTML5 Canvas Test: arcTo() adds to subpath if same point</title>
<link rel="author" title="Microsoft" href="http://www.microsoft.com" />
<link rel="help" href="http://www.w3.org/TR/2dcontext/#dom-context-2d-arcto" />
<meta name="assert" content="If x1,y1 and x2,y2 are the same point, then arcTo must add x1,y1 to the subpath, and connect that point to x0,y0 with a straight line." />
<script type="text/javascript">
function runTest()
{
var canvas = document.getElementById("canvas1");
var ctx = canvas.getContext("2d");
ctx.moveTo(0, 50);

// Since (x1, y1) and (x2, y2) are the same point, (x1, y1) must be added to the subpath, thus creating a line.
ctx.arcTo(100, 50, 100, 50, 10);
ctx.stroke();
}
</script>
</head>
<body onload="runTest()">
<p>Description: If x1,y1 and x2,y2 are the same point, then arcTo must add x1,y1 to the subpath, and connect that point to x0,y0 with a straight line.</p>
<p>Test passes if there is a straight, horizontal line seen on the page.</p>
<canvas id="canvas1" width="300" height="150">Browser does not support HTML5 Canvas.</canvas>
</body>
</html>
<!doctype HTML>
<html>
<head>
<title>HTML5 Canvas Test: arcTo() adds to subpath if same point</title>
<link rel="match" href="canvas_complexshapes_arcto_001-ref.htm">
<link rel="author" title="Microsoft" href="http://www.microsoft.com" />
<link rel="help" href="http://www.w3.org/TR/2dcontext/#dom-context-2d-arcto" />
<meta name="assert" content="If x1,y1 and x2,y2 are the same point, then arcTo must add x1,y1 to the subpath, and connect that point to x0,y0 with a straight line." />
<script type="text/javascript">
function runTest()
{
var canvas = document.getElementById("canvas1");
var ctx = canvas.getContext("2d");
ctx.moveTo(0, 50);

// Since (x1, y1) and (x2, y2) are the same point, (x1, y1) must be added to the subpath, thus creating a line.
ctx.arcTo(100, 50, 100, 50, 10);
ctx.stroke();
}
</script>
</head>
<body onload="runTest()">
<p>Description: If x1,y1 and x2,y2 are the same point, then arcTo must add x1,y1 to the subpath, and connect that point to x0,y0 with a straight line.</p>
<canvas id="canvas1" width="300" height="150">Browser does not support HTML5 Canvas.</canvas>
</body>
</html>
11 changes: 11 additions & 0 deletions 2dcontext/building-paths/canvas_complexshapes_beziercurveto_001-ref.htm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!doctype HTML>
<html>
<head>
<title>HTML5 Canvas Test: bezierCurveTo() must ensure subpaths</title>
<link rel="author" title="Microsoft" href="http://www.microsoft.com" />
</head>
<body>
<p>Description: bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y) must ensure there is a subpath for the point (cp1x,cp1y) if the context has no subpaths, then it must connect the last point in the subpath to the point (x,y).</p>
<div><img src='/images/smiley.png' alt='smiley' /></div>
</body>
</html>
70 changes: 35 additions & 35 deletions 2dcontext/building-paths/canvas_complexshapes_beziercurveto_001.htm
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
<!doctype HTML>
<html>
<head>
<title>HTML5 Canvas Test: bezierCurveTo() must ensure subpaths</title>
<link rel="author" title="Microsoft" href="http://www.microsoft.com" />
<link rel="help" href="http://www.w3.org/TR/2dcontext/#dom-context-2d-beziercurveto" />
<meta name="assert" content="bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y) must ensure there is a subpath for the point (cp1x,cp1y) if the context has no subpaths, then it must connect the last point in the subpath to the point (x,y)." />
<script type="text/javascript">
function runTest()
{
var canvas = document.getElementById("canvas1");
var ctx = canvas.getContext("2d");

// Since the canvas has no subpaths, a virtual moveTo must be performed to (65,25) before creating the bezier.
ctx.bezierCurveTo(65, 25, 65, 25, 65, 65);
ctx.stroke();
ctx.beginPath();

// Since the canvas has no subpaths, a virtual moveTo must be performed to (35,25) before creating the bezier.
ctx.bezierCurveTo(35, 25, 35, 25, 35, 65);
ctx.stroke();
ctx.beginPath();

// Since the canvas has no subpaths, a virtual moveTo must be performed to (0,75) before creating the bezier.
ctx.bezierCurveTo(0, 75, 50, 150, 100, 75);
ctx.stroke();
}
</script>
</head>
<body onload="runTest()">
<p>Description: bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y) must ensure there is a subpath for the point (cp1x,cp1y) if the context has no subpaths, then it must connect the last point in the subpath to the point (x,y).</p>
<p>Test passes if two vertical lines and one curved line are seen below in the shape of a smiley face.</p>
<canvas id="canvas1" width="300" height="150">Browser does not support HTML5 Canvas.</canvas>
</body>
</html>
<!doctype HTML>
<html>
<head>
<title>HTML5 Canvas Test: bezierCurveTo() must ensure subpaths</title>
<link rel="match" href="canvas_complexshapes_beziercurveto_001-ref.htm">
<link rel="author" title="Microsoft" href="http://www.microsoft.com" />
<link rel="help" href="http://www.w3.org/TR/2dcontext/#dom-context-2d-beziercurveto" />
<meta name="assert" content="bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y) must ensure there is a subpath for the point (cp1x,cp1y) if the context has no subpaths, then it must connect the last point in the subpath to the point (x,y)." />
<script type="text/javascript">
function runTest()
{
var canvas = document.getElementById("canvas1");
var ctx = canvas.getContext("2d");

// Since the canvas has no subpaths, a virtual moveTo must be performed to (65,25) before creating the bezier.
ctx.bezierCurveTo(65, 25, 65, 25, 65, 65);
ctx.stroke();
ctx.beginPath();

// Since the canvas has no subpaths, a virtual moveTo must be performed to (35,25) before creating the bezier.
ctx.bezierCurveTo(35, 25, 35, 25, 35, 65);
ctx.stroke();
ctx.beginPath();

// Since the canvas has no subpaths, a virtual moveTo must be performed to (0,75) before creating the bezier.
ctx.bezierCurveTo(0, 75, 50, 150, 100, 75);
ctx.stroke();
}
</script>
</head>
<body onload="runTest()">
<p>Description: bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y) must ensure there is a subpath for the point (cp1x,cp1y) if the context has no subpaths, then it must connect the last point in the subpath to the point (x,y).</p>
<canvas id="canvas1" width="300" height="150">Browser does not support HTML5 Canvas.</canvas>
</body>
</html>
0 ...t-0/the-canvas-element/initial.colour.png → 2dcontext/clear-100x50.png
View file
File renamed without changes
15 changes: 5 additions & 10 deletions 2dcontext/compositing/2d.composite.canvas.copy.html
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
<!DOCTYPE html>
<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
<title>Canvas test: 2d.composite.canvas.copy</title>
<meta name="author" content="Philip Taylor">
<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">
<script src="/common/canvas-tests.js"></script>
<link rel="stylesheet" href="/common/canvas-tests.css">
<body class="show_output">

<h1><a href="index.2d.html">2d</a>.<a href="index.2d.composite.html">composite</a>.<a href="index.2d.composite.canvas.html">canvas</a>.copy</h1>
<h1>2d.composite.canvas.copy</h1>
<p class="desc"></p>

<div class="refs">Spec references:
<ul>
<li><a href="../annotated-spec/canvas.html#testrefs.2d.composite.copy">2d.composite.copy</a>
</ul>
</div>

<p class="output">Actual output:</p>
<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
Expand All @@ -39,5 +34,5 @@ <h1><a href="index.2d.html">2d</a>.<a href="index.2d.composite.html">composite</

});
</script>
<img src="../../../images/yellow75.png" id="yellow75.png" class="resource">
<img src="/images/yellow75.png" id="yellow75.png" class="resource">

15 changes: 5 additions & 10 deletions 2dcontext/compositing/2d.composite.canvas.destination-atop.html
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
<!DOCTYPE html>
<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
<title>Canvas test: 2d.composite.canvas.destination-atop</title>
<meta name="author" content="Philip Taylor">
<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">
<script src="/common/canvas-tests.js"></script>
<link rel="stylesheet" href="/common/canvas-tests.css">
<body class="show_output">

<h1><a href="index.2d.html">2d</a>.<a href="index.2d.composite.html">composite</a>.<a href="index.2d.composite.canvas.html">canvas</a>.destination-atop</h1>
<h1>2d.composite.canvas.destination-atop</h1>
<p class="desc"></p>

<div class="refs">Spec references:
<ul>
<li><a href="../annotated-spec/canvas.html#testrefs.2d.composite.destination-atop">2d.composite.destination-atop</a>
</ul>
</div>

<p class="output">Actual output:</p>
<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
Expand All @@ -39,5 +34,5 @@ <h1><a href="index.2d.html">2d</a>.<a href="index.2d.composite.html">composite</

});
</script>
<img src="../../../images/yellow75.png" id="yellow75.png" class="resource">
<img src="/images/yellow75.png" id="yellow75.png" class="resource">

15 changes: 5 additions & 10 deletions 2dcontext/compositing/2d.composite.canvas.destination-in.html
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
<!DOCTYPE html>
<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
<title>Canvas test: 2d.composite.canvas.destination-in</title>
<meta name="author" content="Philip Taylor">
<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">
<script src="/common/canvas-tests.js"></script>
<link rel="stylesheet" href="/common/canvas-tests.css">
<body class="show_output">

<h1><a href="index.2d.html">2d</a>.<a href="index.2d.composite.html">composite</a>.<a href="index.2d.composite.canvas.html">canvas</a>.destination-in</h1>
<h1>2d.composite.canvas.destination-in</h1>
<p class="desc"></p>

<div class="refs">Spec references:
<ul>
<li><a href="../annotated-spec/canvas.html#testrefs.2d.composite.destination-in">2d.composite.destination-in</a>
</ul>
</div>

<p class="output">Actual output:</p>
<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
Expand All @@ -39,5 +34,5 @@ <h1><a href="index.2d.html">2d</a>.<a href="index.2d.composite.html">composite</

});
</script>
<img src="../../../images/yellow75.png" id="yellow75.png" class="resource">
<img src="/images/yellow75.png" id="yellow75.png" class="resource">

15 changes: 5 additions & 10 deletions 2dcontext/compositing/2d.composite.canvas.destination-out.html
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
<!DOCTYPE html>
<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
<title>Canvas test: 2d.composite.canvas.destination-out</title>
<meta name="author" content="Philip Taylor">
<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">
<script src="/common/canvas-tests.js"></script>
<link rel="stylesheet" href="/common/canvas-tests.css">
<body class="show_output">

<h1><a href="index.2d.html">2d</a>.<a href="index.2d.composite.html">composite</a>.<a href="index.2d.composite.canvas.html">canvas</a>.destination-out</h1>
<h1>2d.composite.canvas.destination-out</h1>
<p class="desc"></p>

<div class="refs">Spec references:
<ul>
<li><a href="../annotated-spec/canvas.html#testrefs.2d.composite.destination-out">2d.composite.destination-out</a>
</ul>
</div>

<p class="output">Actual output:</p>
<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
Expand All @@ -39,5 +34,5 @@ <h1><a href="index.2d.html">2d</a>.<a href="index.2d.composite.html">composite</

});
</script>
<img src="../../../images/yellow75.png" id="yellow75.png" class="resource">
<img src="/images/yellow75.png" id="yellow75.png" class="resource">

15 changes: 5 additions & 10 deletions 2dcontext/compositing/2d.composite.canvas.destination-over.html
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
<!DOCTYPE html>
<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
<title>Canvas test: 2d.composite.canvas.destination-over</title>
<meta name="author" content="Philip Taylor">
<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">
<script src="/common/canvas-tests.js"></script>
<link rel="stylesheet" href="/common/canvas-tests.css">
<body class="show_output">

<h1><a href="index.2d.html">2d</a>.<a href="index.2d.composite.html">composite</a>.<a href="index.2d.composite.canvas.html">canvas</a>.destination-over</h1>
<h1>2d.composite.canvas.destination-over</h1>
<p class="desc"></p>

<div class="refs">Spec references:
<ul>
<li><a href="../annotated-spec/canvas.html#testrefs.2d.composite.destination-over">2d.composite.destination-over</a>
</ul>
</div>

<p class="output">Actual output:</p>
<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
Expand All @@ -39,5 +34,5 @@ <h1><a href="index.2d.html">2d</a>.<a href="index.2d.composite.html">composite</

});
</script>
<img src="../../../images/yellow75.png" id="yellow75.png" class="resource">
<img src="/images/yellow75.png" id="yellow75.png" class="resource">

15 changes: 5 additions & 10 deletions 2dcontext/compositing/2d.composite.canvas.lighter.html
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
<!DOCTYPE html>
<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
<title>Canvas test: 2d.composite.canvas.lighter</title>
<meta name="author" content="Philip Taylor">
<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">
<script src="/common/canvas-tests.js"></script>
<link rel="stylesheet" href="/common/canvas-tests.css">
<body class="show_output">

<h1><a href="index.2d.html">2d</a>.<a href="index.2d.composite.html">composite</a>.<a href="index.2d.composite.canvas.html">canvas</a>.lighter</h1>
<h1>2d.composite.canvas.lighter</h1>
<p class="desc"></p>

<div class="refs">Spec references:
<ul>
<li><a href="../annotated-spec/canvas.html#testrefs.2d.composite.lighter">2d.composite.lighter</a>
</ul>
</div>

<p class="output">Actual output:</p>
<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
Expand All @@ -39,5 +34,5 @@ <h1><a href="index.2d.html">2d</a>.<a href="index.2d.composite.html">composite</

});
</script>
<img src="../../../images/yellow75.png" id="yellow75.png" class="resource">
<img src="/images/yellow75.png" id="yellow75.png" class="resource">

Loading

0 comments on commit 57272a6

Please sign in to comment.