Commit f7269e04 authored by chang.shu@nokia.com's avatar chang.shu@nokia.com

2010-11-11 Chang Shu <chang.shu@nokia.com>

        Reviewed by Csaba Osztrogonác  <ossy@webkit.org>.

        Clean up LayoutTests/canvas/philip/tests/security* tests
        https://bugs.webkit.org/show_bug.cgi?id=49317

        The security tests require httpd and should be in http/tests/canvas/philip/tests.

        * canvas/philip/tests/security.drawImage.canvas-expected.txt: Removed.
        * canvas/philip/tests/security.drawImage.canvas.html: Removed.
        * canvas/philip/tests/security.drawImage.image-expected.txt: Removed.
        * canvas/philip/tests/security.drawImage.image.html: Removed.
        * canvas/philip/tests/security.pattern.canvas.fillStyle-expected.txt: Removed.
        * canvas/philip/tests/security.pattern.canvas.fillStyle.html: Removed.
        * canvas/philip/tests/security.pattern.canvas.strokeStyle-expected.txt: Removed.
        * canvas/philip/tests/security.pattern.canvas.strokeStyle.html: Removed.
        * canvas/philip/tests/security.pattern.canvas.timing-expected.txt: Removed.
        * canvas/philip/tests/security.pattern.canvas.timing.html: Removed.
        * canvas/philip/tests/security.pattern.create-expected.txt: Removed.
        * canvas/philip/tests/security.pattern.create.html: Removed.
        * canvas/philip/tests/security.pattern.cross-expected.txt: Removed.
        * canvas/philip/tests/security.pattern.cross.html: Removed.
        * canvas/philip/tests/security.pattern.image.fillStyle-expected.txt: Removed.
        * canvas/philip/tests/security.pattern.image.fillStyle.html: Removed.
        * canvas/philip/tests/security.pattern.image.strokeStyle-expected.txt: Removed.
        * canvas/philip/tests/security.pattern.image.strokeStyle.html: Removed.
        * canvas/philip/tests/security.reset-expected.txt: Removed.
        * canvas/philip/tests/security.reset.html: Removed.
        * platform/chromium/test_expectations.txt:
        * platform/gtk/Skipped:
        * platform/mac-leopard/Skipped:
        * platform/qt/Skipped:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71822 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f2c5899e
2010-11-11 Chang Shu <chang.shu@nokia.com>
Reviewed by Csaba Osztrogonác <ossy@webkit.org>.
Clean up LayoutTests/canvas/philip/tests/security* tests
https://bugs.webkit.org/show_bug.cgi?id=49317
The security tests require httpd and should be in http/tests/canvas/philip/tests.
* canvas/philip/tests/security.drawImage.canvas-expected.txt: Removed.
* canvas/philip/tests/security.drawImage.canvas.html: Removed.
* canvas/philip/tests/security.drawImage.image-expected.txt: Removed.
* canvas/philip/tests/security.drawImage.image.html: Removed.
* canvas/philip/tests/security.pattern.canvas.fillStyle-expected.txt: Removed.
* canvas/philip/tests/security.pattern.canvas.fillStyle.html: Removed.
* canvas/philip/tests/security.pattern.canvas.strokeStyle-expected.txt: Removed.
* canvas/philip/tests/security.pattern.canvas.strokeStyle.html: Removed.
* canvas/philip/tests/security.pattern.canvas.timing-expected.txt: Removed.
* canvas/philip/tests/security.pattern.canvas.timing.html: Removed.
* canvas/philip/tests/security.pattern.create-expected.txt: Removed.
* canvas/philip/tests/security.pattern.create.html: Removed.
* canvas/philip/tests/security.pattern.cross-expected.txt: Removed.
* canvas/philip/tests/security.pattern.cross.html: Removed.
* canvas/philip/tests/security.pattern.image.fillStyle-expected.txt: Removed.
* canvas/philip/tests/security.pattern.image.fillStyle.html: Removed.
* canvas/philip/tests/security.pattern.image.strokeStyle-expected.txt: Removed.
* canvas/philip/tests/security.pattern.image.strokeStyle.html: Removed.
* canvas/philip/tests/security.reset-expected.txt: Removed.
* canvas/philip/tests/security.reset.html: Removed.
* platform/chromium/test_expectations.txt:
* platform/gtk/Skipped:
* platform/mac-leopard/Skipped:
* platform/qt/Skipped:
2010-11-11 Marcus Bulach <bulach@chromium.org>
Update chromium baselines for svg following r71802
<!DOCTYPE html>
<title>Canvas test: security.drawImage.canvas</title>
<script src="../tests.js"></script>
<link rel="stylesheet" href="../tests.css">
<body>
<p id="passtext">Pass</p>
<p id="failtext">Fail</p>
<p class="output">These images should be identical:</p>
<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
<ul id="d"></ul>
<script>
_addTest(function(canvas, ctx) {
var canvas2 = document.createElement('canvas');
canvas2.width = 100;
canvas2.height = 50;
var ctx2 = canvas2.getContext('2d');
ctx2.drawImage(document.getElementById('yellow.png'), 0, 0);
ctx.drawImage(canvas2, 0, 0);
try { var _thrown = false; canvas.toDataURL(); } catch (e) { _thrown = true; } finally { _assert(_thrown, "should throw exception: canvas.toDataURL()"); }
try { var _thrown = false; ctx.getImageData(0, 0, 1, 1); } catch (e) { _thrown = true; } finally { _assert(_thrown, "should throw exception: ctx.getImageData(0, 0, 1, 1)"); }
});
</script>
<img src="http://test2.w3.org/html/tests/approved/images/yellow.png" id="yellow.png" class="resource">
<!DOCTYPE html>
<title>Canvas test: security.drawImage.image</title>
<script src="../tests.js"></script>
<link rel="stylesheet" href="../tests.css">
<body>
<p id="passtext">Pass</p>
<p id="failtext">Fail</p>
<p class="output">These images should be identical:</p>
<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
<ul id="d"></ul>
<script>
_addTest(function(canvas, ctx) {
ctx.drawImage(document.getElementById('yellow.png'), 0, 0);
try { var _thrown = false; canvas.toDataURL(); } catch (e) { _thrown = true; } finally { _assert(_thrown, "should throw exception: canvas.toDataURL()"); }
try { var _thrown = false; ctx.getImageData(0, 0, 1, 1); } catch (e) { _thrown = true; } finally { _assert(_thrown, "should throw exception: ctx.getImageData(0, 0, 1, 1)"); }
});
</script>
<img src="http://test2.w3.org/html/tests/approved/images/yellow.png" id="yellow.png" class="resource">
<!DOCTYPE html>
<title>Canvas test: security.pattern.canvas.fillStyle</title>
<script src="../tests.js"></script>
<link rel="stylesheet" href="../tests.css">
<body>
<p id="passtext">Pass</p>
<p id="failtext">Fail</p>
<p class="output">These images should be identical:</p>
<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
<ul id="d"></ul>
<script>
_addTest(function(canvas, ctx) {
var canvas2 = document.createElement('canvas');
canvas2.width = 100;
canvas2.height = 50;
var ctx2 = canvas2.getContext('2d');
ctx2.drawImage(document.getElementById('yellow.png'), 0, 0);
var p = ctx.createPattern(canvas2, 'repeat');
ctx.fillStyle = p;
ctx.fillStyle = 'red';
try { var _thrown = false; canvas.toDataURL(); } catch (e) { _thrown = true; } finally { _assert(_thrown, "should throw exception: canvas.toDataURL()"); }
try { var _thrown = false; ctx.getImageData(0, 0, 1, 1); } catch (e) { _thrown = true; } finally { _assert(_thrown, "should throw exception: ctx.getImageData(0, 0, 1, 1)"); }
});
</script>
<img src="http://test2.w3.org/html/tests/approved/images/yellow.png" id="yellow.png" class="resource">
<!DOCTYPE html>
<title>Canvas test: security.pattern.canvas.strokeStyle</title>
<script src="../tests.js"></script>
<link rel="stylesheet" href="../tests.css">
<body>
<p id="passtext">Pass</p>
<p id="failtext">Fail</p>
<p class="output">These images should be identical:</p>
<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
<ul id="d"></ul>
<script>
_addTest(function(canvas, ctx) {
var canvas2 = document.createElement('canvas');
canvas2.width = 100;
canvas2.height = 50;
var ctx2 = canvas2.getContext('2d');
ctx2.drawImage(document.getElementById('yellow.png'), 0, 0);
var p = ctx.createPattern(canvas2, 'repeat');
ctx.strokeStyle = p;
ctx.strokeStyle = 'red';
try { var _thrown = false; canvas.toDataURL(); } catch (e) { _thrown = true; } finally { _assert(_thrown, "should throw exception: canvas.toDataURL()"); }
try { var _thrown = false; ctx.getImageData(0, 0, 1, 1); } catch (e) { _thrown = true; } finally { _assert(_thrown, "should throw exception: ctx.getImageData(0, 0, 1, 1)"); }
});
</script>
<img src="http://test2.w3.org/html/tests/approved/images/yellow.png" id="yellow.png" class="resource">
Blocked access to external URL http://test2.w3.org/html/tests/approved/images/yellow.png
Passed
<!DOCTYPE html>
<title>Canvas test: security.pattern.canvas.timing</title>
<script src="../tests.js"></script>
<link rel="stylesheet" href="../tests.css">
<body>
<p id="passtext">Pass</p>
<p id="failtext">Fail</p>
<p class="output">These images should be identical:</p>
<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
<ul id="d"></ul>
<script>
_addTest(function(canvas, ctx) {
var canvas2 = document.createElement('canvas');
canvas2.width = 100;
canvas2.height = 50;
var ctx2 = canvas2.getContext('2d');
ctx2.fillStyle = '#0f0';
ctx2.fillRect(0, 0, 100, 50);
var p = ctx.createPattern(canvas2, 'repeat');
ctx2.drawImage(document.getElementById('yellow.png'), 0, 0); // make canvas2 origin-unclean
ctx.fillStyle = p;
ctx.fillRect(0, 0, 100, 50);
canvas.toDataURL();
ctx.getImageData(0, 0, 1, 1);
_assert(true, "true"); // okay if there was no exception
});
</script>
<img src="http://test2.w3.org/html/tests/approved/images/yellow.png" id="yellow.png" class="resource">
Blocked access to external URL http://test2.w3.org/html/tests/approved/images/yellow.png
Passed
<!DOCTYPE html>
<title>Canvas test: security.pattern.create</title>
<script src="../tests.js"></script>
<link rel="stylesheet" href="../tests.css">
<body>
<p id="passtext">Pass</p>
<p id="failtext">Fail</p>
<p class="output">These images should be identical:</p>
<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
<ul id="d"></ul>
<script>
_addTest(function(canvas, ctx) {
var p = ctx.createPattern(document.getElementById('yellow.png'), 'repeat');
canvas.toDataURL();
ctx.getImageData(0, 0, 1, 1);
_assert(true, "true"); // okay if there was no exception
});
</script>
<img src="http://test2.w3.org/html/tests/approved/images/yellow.png" id="yellow.png" class="resource">
Blocked access to external URL http://test2.w3.org/html/tests/approved/images/yellow.png
Failed assertion: should throw exception: canvas.toDataURL()
Failed assertion: should throw exception: ctx.getImageData(0, 0, 1, 1)
<!DOCTYPE html>
<title>Canvas test: security.pattern.cross</title>
<script src="../tests.js"></script>
<link rel="stylesheet" href="../tests.css">
<body>
<p id="passtext">Pass</p>
<p id="failtext">Fail</p>
<p class="output">These images should be identical:</p>
<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
<ul id="d"></ul>
<script>
_addTest(function(canvas, ctx) {
var canvas2 = document.createElement('canvas');
canvas2.width = 100;
canvas2.height = 50;
var ctx2 = canvas2.getContext('2d');
var p = ctx2.createPattern(document.getElementById('yellow.png'), 'repeat');
ctx.fillStyle = p;
ctx.fillRect(0, 0, 100, 50);
try { var _thrown = false; canvas.toDataURL(); } catch (e) { _thrown = true; } finally { _assert(_thrown, "should throw exception: canvas.toDataURL()"); }
try { var _thrown = false; ctx.getImageData(0, 0, 1, 1); } catch (e) { _thrown = true; } finally { _assert(_thrown, "should throw exception: ctx.getImageData(0, 0, 1, 1)"); }
canvas2.toDataURL();
ctx2.getImageData(0, 0, 1, 1);
});
</script>
<img src="http://test2.w3.org/html/tests/approved/images/yellow.png" id="yellow.png" class="resource">
Blocked access to external URL http://test2.w3.org/html/tests/approved/images/yellow.png
Failed assertion: should throw exception: canvas.toDataURL()
Failed assertion: should throw exception: ctx.getImageData(0, 0, 1, 1)
<!DOCTYPE html>
<title>Canvas test: security.pattern.image.fillStyle</title>
<script src="../tests.js"></script>
<link rel="stylesheet" href="../tests.css">
<body>
<p id="passtext">Pass</p>
<p id="failtext">Fail</p>
<p class="output">These images should be identical:</p>
<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
<ul id="d"></ul>
<script>
_addTest(function(canvas, ctx) {
var p = ctx.createPattern(document.getElementById('yellow.png'), 'repeat');
ctx.fillStyle = p;
ctx.fillStyle = 'red';
try { var _thrown = false; canvas.toDataURL(); } catch (e) { _thrown = true; } finally { _assert(_thrown, "should throw exception: canvas.toDataURL()"); }
try { var _thrown = false; ctx.getImageData(0, 0, 1, 1); } catch (e) { _thrown = true; } finally { _assert(_thrown, "should throw exception: ctx.getImageData(0, 0, 1, 1)"); }
});
</script>
<img src="http://test2.w3.org/html/tests/approved/images/yellow.png" id="yellow.png" class="resource">
Blocked access to external URL http://test2.w3.org/html/tests/approved/images/yellow.png
Failed assertion: should throw exception: canvas.toDataURL()
Failed assertion: should throw exception: ctx.getImageData(0, 0, 1, 1)
<!DOCTYPE html>
<title>Canvas test: security.pattern.image.strokeStyle</title>
<script src="../tests.js"></script>
<link rel="stylesheet" href="../tests.css">
<body>
<p id="passtext">Pass</p>
<p id="failtext">Fail</p>
<p class="output">These images should be identical:</p>
<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
<ul id="d"></ul>
<script>
_addTest(function(canvas, ctx) {
var p = ctx.createPattern(document.getElementById('yellow.png'), 'repeat');
ctx.strokeStyle = p;
ctx.strokeStyle = 'red';
try { var _thrown = false; canvas.toDataURL(); } catch (e) { _thrown = true; } finally { _assert(_thrown, "should throw exception: canvas.toDataURL()"); }
try { var _thrown = false; ctx.getImageData(0, 0, 1, 1); } catch (e) { _thrown = true; } finally { _assert(_thrown, "should throw exception: ctx.getImageData(0, 0, 1, 1)"); }
});
</script>
<img src="http://test2.w3.org/html/tests/approved/images/yellow.png" id="yellow.png" class="resource">
<!DOCTYPE html>
<title>Canvas test: security.reset</title>
<script src="../tests.js"></script>
<link rel="stylesheet" href="../tests.css">
<body>
<p id="passtext">Pass</p>
<p id="failtext">Fail</p>
<p class="output">These images should be identical:</p>
<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
<ul id="d"></ul>
<script>
_addTest(function(canvas, ctx) {
canvas.width = 50;
ctx.drawImage(document.getElementById('yellow.png'), 0, 0);
try { var _thrown = false; canvas.toDataURL(); } catch (e) { _thrown = true; } finally { _assert(_thrown, "should throw exception: canvas.toDataURL()"); }
canvas.width = 100;
try { var _thrown = false; canvas.toDataURL(); } catch (e) { _thrown = true; } finally { _assert(_thrown, "should throw exception: canvas.toDataURL()"); }
});
</script>
<img src="http://test2.w3.org/html/tests/approved/images/yellow.png" id="yellow.png" class="resource">
......@@ -3309,11 +3309,6 @@ BUG62301 MAC LINUX WIN : canvas/philip/tests/2d.pattern.image.null.html = TEXT
BUG62301 LINUX WIN : canvas/philip/tests/2d.shadow.enable.x.html = TEXT
BUG62301 LINUX WIN : canvas/philip/tests/2d.shadow.enable.y.html = TEXT
BUG62301 LINUX WIN : canvas/philip/tests/2d.strokeRect.zero.4.html = TEXT
BUG62301 MAC LINUX WIN : canvas/philip/tests/security.drawImage.canvas.html = TEXT
BUG62301 MAC LINUX WIN : canvas/philip/tests/security.drawImage.image.html = TEXT
BUG62301 MAC LINUX WIN : canvas/philip/tests/security.pattern.canvas.fillStyle.html = TEXT
BUG62301 MAC LINUX WIN : canvas/philip/tests/security.pattern.canvas.strokeStyle.html = TEXT
BUG62301 MAC LINUX WIN : canvas/philip/tests/security.reset.html = TEXT
BUG62301 LINUX WIN : canvas/philip/tests/toDataURL.jpeg.alpha.html = TEXT
BUGWK49265 LINUX : svg/dynamic-updates/SVGFEConvolveMatrixElement-svgdom-edgeMode-prop.html = IMAGE PASS
......
......@@ -5391,16 +5391,6 @@ canvas/philip/tests/2d.fillStyle.parse.rgba-eof.html
canvas/philip/tests/2d.imageData.put.wrongtype.html
canvas/philip/tests/2d.pattern.image.incomplete.empty.html
canvas/philip/tests/2d.pattern.image.incomplete.omitted.html
canvas/philip/tests/security.drawImage.canvas.html
canvas/philip/tests/security.drawImage.image.html
canvas/philip/tests/security.pattern.canvas.fillStyle.html
canvas/philip/tests/security.pattern.canvas.strokeStyle.html
canvas/philip/tests/security.reset.html
canvas/philip/tests/security.pattern.canvas.timing.html
canvas/philip/tests/security.pattern.create.html
canvas/philip/tests/security.pattern.cross.html
canvas/philip/tests/security.pattern.image.fillStyle.html
canvas/philip/tests/security.pattern.image.strokeStyle.html
# Setting CSS properties such as padding and margin does not work properly
# on form elements: https://bugs.webkit.org/show_bug.cgi?id=40855
......
......@@ -167,8 +167,3 @@ canvas/philip/tests/2d.fillStyle.parse.rgba-eof.html
canvas/philip/tests/2d.imageData.put.wrongtype.html
canvas/philip/tests/2d.pattern.image.incomplete.empty.html
canvas/philip/tests/2d.pattern.image.incomplete.omitted.html
canvas/philip/tests/security.drawImage.canvas.html
canvas/philip/tests/security.drawImage.image.html
canvas/philip/tests/security.pattern.canvas.fillStyle.html
canvas/philip/tests/security.pattern.canvas.strokeStyle.html
canvas/philip/tests/security.reset.html
......@@ -5102,16 +5102,6 @@ canvas/philip/tests/2d.fillStyle.parse.rgba-eof.html
canvas/philip/tests/2d.imageData.put.wrongtype.html
canvas/philip/tests/2d.pattern.image.incomplete.empty.html
canvas/philip/tests/2d.pattern.image.incomplete.omitted.html
canvas/philip/tests/security.drawImage.canvas.html
canvas/philip/tests/security.drawImage.image.html
canvas/philip/tests/security.pattern.canvas.fillStyle.html
canvas/philip/tests/security.pattern.canvas.strokeStyle.html
canvas/philip/tests/security.reset.html
canvas/philip/tests/security.pattern.canvas.timing.html
canvas/philip/tests/security.pattern.create.html
canvas/philip/tests/security.pattern.cross.html
canvas/philip/tests/security.pattern.image.fillStyle.html
canvas/philip/tests/security.pattern.image.strokeStyle.html
# ============================================================================= #
# failing transforms tests
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment