[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
chang.shu at nokia.com
chang.shu at nokia.com
Wed Dec 22 15:44:28 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f7269e043bc3b6ed8205c88d2b23e831786c0e6b
Author: chang.shu at nokia.com <chang.shu at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 11 15:51:25 2010 +0000
2010-11-11 Chang Shu <chang.shu at nokia.com>
Reviewed by Csaba Osztrogonác <ossy at 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
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ec10524..6cbfc62 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,37 @@
+2010-11-11 Chang Shu <chang.shu at nokia.com>
+
+ Reviewed by Csaba Osztrogonác <ossy at 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 at chromium.org>
Update chromium baselines for svg following r71802
diff --git a/LayoutTests/canvas/philip/tests/security.drawImage.canvas-expected.txt b/LayoutTests/canvas/philip/tests/security.drawImage.canvas-expected.txt
deleted file mode 100644
index 863339f..0000000
--- a/LayoutTests/canvas/philip/tests/security.drawImage.canvas-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-Passed
diff --git a/LayoutTests/canvas/philip/tests/security.drawImage.canvas.html b/LayoutTests/canvas/philip/tests/security.drawImage.canvas.html
deleted file mode 100644
index 541e960..0000000
--- a/LayoutTests/canvas/philip/tests/security.drawImage.canvas.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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">
-
diff --git a/LayoutTests/canvas/philip/tests/security.drawImage.image-expected.txt b/LayoutTests/canvas/philip/tests/security.drawImage.image-expected.txt
deleted file mode 100644
index 863339f..0000000
--- a/LayoutTests/canvas/philip/tests/security.drawImage.image-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-Passed
diff --git a/LayoutTests/canvas/philip/tests/security.drawImage.image.html b/LayoutTests/canvas/philip/tests/security.drawImage.image.html
deleted file mode 100644
index e12f665..0000000
--- a/LayoutTests/canvas/philip/tests/security.drawImage.image.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!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">
-
diff --git a/LayoutTests/canvas/philip/tests/security.pattern.canvas.fillStyle-expected.txt b/LayoutTests/canvas/philip/tests/security.pattern.canvas.fillStyle-expected.txt
deleted file mode 100644
index 863339f..0000000
--- a/LayoutTests/canvas/philip/tests/security.pattern.canvas.fillStyle-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-Passed
diff --git a/LayoutTests/canvas/philip/tests/security.pattern.canvas.fillStyle.html b/LayoutTests/canvas/philip/tests/security.pattern.canvas.fillStyle.html
deleted file mode 100644
index b690ff4..0000000
--- a/LayoutTests/canvas/philip/tests/security.pattern.canvas.fillStyle.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!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">
-
diff --git a/LayoutTests/canvas/philip/tests/security.pattern.canvas.strokeStyle-expected.txt b/LayoutTests/canvas/philip/tests/security.pattern.canvas.strokeStyle-expected.txt
deleted file mode 100644
index 863339f..0000000
--- a/LayoutTests/canvas/philip/tests/security.pattern.canvas.strokeStyle-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-Passed
diff --git a/LayoutTests/canvas/philip/tests/security.pattern.canvas.strokeStyle.html b/LayoutTests/canvas/philip/tests/security.pattern.canvas.strokeStyle.html
deleted file mode 100644
index d3235b5..0000000
--- a/LayoutTests/canvas/philip/tests/security.pattern.canvas.strokeStyle.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!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">
-
diff --git a/LayoutTests/canvas/philip/tests/security.pattern.canvas.timing-expected.txt b/LayoutTests/canvas/philip/tests/security.pattern.canvas.timing-expected.txt
deleted file mode 100644
index 2b37ecb..0000000
--- a/LayoutTests/canvas/philip/tests/security.pattern.canvas.timing-expected.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Blocked access to external URL http://test2.w3.org/html/tests/approved/images/yellow.png
-Passed
-
diff --git a/LayoutTests/canvas/philip/tests/security.pattern.canvas.timing.html b/LayoutTests/canvas/philip/tests/security.pattern.canvas.timing.html
deleted file mode 100644
index 9202f5c..0000000
--- a/LayoutTests/canvas/philip/tests/security.pattern.canvas.timing.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!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">
-
diff --git a/LayoutTests/canvas/philip/tests/security.pattern.create-expected.txt b/LayoutTests/canvas/philip/tests/security.pattern.create-expected.txt
deleted file mode 100644
index 2b37ecb..0000000
--- a/LayoutTests/canvas/philip/tests/security.pattern.create-expected.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Blocked access to external URL http://test2.w3.org/html/tests/approved/images/yellow.png
-Passed
-
diff --git a/LayoutTests/canvas/philip/tests/security.pattern.create.html b/LayoutTests/canvas/philip/tests/security.pattern.create.html
deleted file mode 100644
index 4e85ffa..0000000
--- a/LayoutTests/canvas/philip/tests/security.pattern.create.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!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">
-
diff --git a/LayoutTests/canvas/philip/tests/security.pattern.cross-expected.txt b/LayoutTests/canvas/philip/tests/security.pattern.cross-expected.txt
deleted file mode 100644
index a98932d..0000000
--- a/LayoutTests/canvas/philip/tests/security.pattern.cross-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-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)
-
diff --git a/LayoutTests/canvas/philip/tests/security.pattern.cross.html b/LayoutTests/canvas/philip/tests/security.pattern.cross.html
deleted file mode 100644
index 44bdba8..0000000
--- a/LayoutTests/canvas/philip/tests/security.pattern.cross.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!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">
-
diff --git a/LayoutTests/canvas/philip/tests/security.pattern.image.fillStyle-expected.txt b/LayoutTests/canvas/philip/tests/security.pattern.image.fillStyle-expected.txt
deleted file mode 100644
index a98932d..0000000
--- a/LayoutTests/canvas/philip/tests/security.pattern.image.fillStyle-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-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)
-
diff --git a/LayoutTests/canvas/philip/tests/security.pattern.image.fillStyle.html b/LayoutTests/canvas/philip/tests/security.pattern.image.fillStyle.html
deleted file mode 100644
index 733e0bb..0000000
--- a/LayoutTests/canvas/philip/tests/security.pattern.image.fillStyle.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!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">
-
diff --git a/LayoutTests/canvas/philip/tests/security.pattern.image.strokeStyle-expected.txt b/LayoutTests/canvas/philip/tests/security.pattern.image.strokeStyle-expected.txt
deleted file mode 100644
index a98932d..0000000
--- a/LayoutTests/canvas/philip/tests/security.pattern.image.strokeStyle-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-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)
-
diff --git a/LayoutTests/canvas/philip/tests/security.pattern.image.strokeStyle.html b/LayoutTests/canvas/philip/tests/security.pattern.image.strokeStyle.html
deleted file mode 100644
index 69656f5..0000000
--- a/LayoutTests/canvas/philip/tests/security.pattern.image.strokeStyle.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!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">
-
diff --git a/LayoutTests/canvas/philip/tests/security.reset-expected.txt b/LayoutTests/canvas/philip/tests/security.reset-expected.txt
deleted file mode 100644
index 863339f..0000000
--- a/LayoutTests/canvas/philip/tests/security.reset-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-Passed
diff --git a/LayoutTests/canvas/philip/tests/security.reset.html b/LayoutTests/canvas/philip/tests/security.reset.html
deleted file mode 100644
index cf2d902..0000000
--- a/LayoutTests/canvas/philip/tests/security.reset.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!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">
-
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 2815389..cab5a5e 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -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
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 99379ce..23a6b04 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -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
diff --git a/LayoutTests/platform/mac-leopard/Skipped b/LayoutTests/platform/mac-leopard/Skipped
index d29e50b..5370f9e 100644
--- a/LayoutTests/platform/mac-leopard/Skipped
+++ b/LayoutTests/platform/mac-leopard/Skipped
@@ -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
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 67b521b..f951b30 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -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
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list