[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
bweinstein at apple.com
bweinstein at apple.com
Wed Dec 22 12:40:01 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 7a8f9999ff2c5c8f6a960ae62c17c83672702f01
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 26 22:54:04 2010 +0000
Userscripts on special documents should be tested
<https://bugs.webkit.org/show_bug.cgi?id=44725>
Reviewed by Dave Hyatt.
Add tests of user script injection in audio, image, plugin, and video documents.
* userscripts/user-script-audio-document.html: Added. Test injection of user scripts
in an audio document.
* userscripts/user-script-audio-document-expected.txt: Added.
* userscripts/user-script-image-document.html: Added. Test injection of user scripts
in an image document.
* userscripts/user-script-image-document-expected.txt: Added.
* userscripts/user-script-plugin-document.html: Added. Test injection of user scripts
in a plugin document.
* userscripts/user-script-plugin-document-expected.txt: Added.
* userscripts/user-script-video-document.html: Added. Test injection of user scripts
in a video document.
* userscripts/user-script-video-document-expected.txt: Added.
* userscripts/resources/abe.png: Copied from media/content/abe.png.
* userscripts/resources/counting.mp4: Copied from media/content/counting.mp4.
* userscripts/resources/test.wav: Copied from media/content/test.wav.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66144 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6cfae1d..0243a6e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,29 @@
+2010-08-26 Brian Weinstein <bweinstein at apple.com>
+
+ Reviewed by Dave Hyatt.
+
+ Userscripts on special documents should be tested
+ <https://bugs.webkit.org/show_bug.cgi?id=44725>
+
+ Add tests of user script injection in audio, image, plugin, and video documents.
+
+ * userscripts/user-script-audio-document.html: Added. Test injection of user scripts
+ in an audio document.
+ * userscripts/user-script-audio-document-expected.txt: Added.
+ * userscripts/user-script-image-document.html: Added. Test injection of user scripts
+ in an image document.
+ * userscripts/user-script-image-document-expected.txt: Added.
+ * userscripts/user-script-plugin-document.html: Added. Test injection of user scripts
+ in a plugin document.
+ * userscripts/user-script-plugin-document-expected.txt: Added.
+ * userscripts/user-script-video-document.html: Added. Test injection of user scripts
+ in a video document.
+ * userscripts/user-script-video-document-expected.txt: Added.
+
+ * userscripts/resources/abe.png: Copied from media/content/abe.png.
+ * userscripts/resources/counting.mp4: Copied from media/content/counting.mp4.
+ * userscripts/resources/test.wav: Copied from media/content/test.wav.
+
2010-08-26 Simon Fraser <simon.fraser at apple.com>
Reviewed by Dave Hyatt.
diff --git a/LayoutTests/userscripts/user-script-audio-document-expected.txt b/LayoutTests/userscripts/user-script-audio-document-expected.txt
new file mode 100644
index 0000000..f1e8cf6
--- /dev/null
+++ b/LayoutTests/userscripts/user-script-audio-document-expected.txt
@@ -0,0 +1,5 @@
+CONSOLE MESSAGE: line 1: Start Script
+CONSOLE MESSAGE: line 1: End Script
+CONSOLE MESSAGE: line 1: Start Script
+CONSOLE MESSAGE: line 1: End Script
+
diff --git a/LayoutTests/userscripts/user-script-audio-document.html b/LayoutTests/userscripts/user-script-audio-document.html
new file mode 100644
index 0000000..97e6818
--- /dev/null
+++ b/LayoutTests/userscripts/user-script-audio-document.html
@@ -0,0 +1,14 @@
+<html>
+<head>
+<script>
+if (window.layoutTestController) {
+ window.layoutTestController.dumpAsText();
+ window.layoutTestController.addUserScript("console.log('Start Script')", true, true);
+ window.layoutTestController.addUserScript("console.log('End Script')", false, true);
+}
+</script>
+</head>
+<body>
+<iframe src="resources/test.wav"></iframe>
+</body>
+</html>
diff --git a/LayoutTests/userscripts/user-script-image-document-expected.txt b/LayoutTests/userscripts/user-script-image-document-expected.txt
new file mode 100644
index 0000000..f1e8cf6
--- /dev/null
+++ b/LayoutTests/userscripts/user-script-image-document-expected.txt
@@ -0,0 +1,5 @@
+CONSOLE MESSAGE: line 1: Start Script
+CONSOLE MESSAGE: line 1: End Script
+CONSOLE MESSAGE: line 1: Start Script
+CONSOLE MESSAGE: line 1: End Script
+
diff --git a/LayoutTests/userscripts/user-script-image-document.html b/LayoutTests/userscripts/user-script-image-document.html
new file mode 100644
index 0000000..0137ce6
--- /dev/null
+++ b/LayoutTests/userscripts/user-script-image-document.html
@@ -0,0 +1,14 @@
+<html>
+<head>
+<script>
+if (window.layoutTestController) {
+ window.layoutTestController.dumpAsText();
+ window.layoutTestController.addUserScript("console.log('Start Script')", true, true);
+ window.layoutTestController.addUserScript("console.log('End Script')", false, true);
+}
+</script>
+</head>
+<body>
+<iframe src="resources/abe.png"></iframe>
+</body>
+</html>
diff --git a/LayoutTests/userscripts/user-script-plugin-document-expected.txt b/LayoutTests/userscripts/user-script-plugin-document-expected.txt
new file mode 100644
index 0000000..f1e8cf6
--- /dev/null
+++ b/LayoutTests/userscripts/user-script-plugin-document-expected.txt
@@ -0,0 +1,5 @@
+CONSOLE MESSAGE: line 1: Start Script
+CONSOLE MESSAGE: line 1: End Script
+CONSOLE MESSAGE: line 1: Start Script
+CONSOLE MESSAGE: line 1: End Script
+
diff --git a/LayoutTests/userscripts/user-script-plugin-document.html b/LayoutTests/userscripts/user-script-plugin-document.html
new file mode 100644
index 0000000..d6c36d6
--- /dev/null
+++ b/LayoutTests/userscripts/user-script-plugin-document.html
@@ -0,0 +1,14 @@
+<html>
+<head>
+<script>
+if (window.layoutTestController) {
+ window.layoutTestController.dumpAsText();
+ window.layoutTestController.addUserScript("console.log('Start Script')", true, true);
+ window.layoutTestController.addUserScript("console.log('End Script')", false, true);
+}
+</script>
+</head>
+<body>
+<iframe src="data:application/x-webkit-test-netscape,"></iframe>
+</body>
+</html>
diff --git a/LayoutTests/userscripts/user-script-video-document-expected.txt b/LayoutTests/userscripts/user-script-video-document-expected.txt
new file mode 100644
index 0000000..f1e8cf6
--- /dev/null
+++ b/LayoutTests/userscripts/user-script-video-document-expected.txt
@@ -0,0 +1,5 @@
+CONSOLE MESSAGE: line 1: Start Script
+CONSOLE MESSAGE: line 1: End Script
+CONSOLE MESSAGE: line 1: Start Script
+CONSOLE MESSAGE: line 1: End Script
+
diff --git a/LayoutTests/userscripts/user-script-video-document.html b/LayoutTests/userscripts/user-script-video-document.html
new file mode 100644
index 0000000..2119fa9
--- /dev/null
+++ b/LayoutTests/userscripts/user-script-video-document.html
@@ -0,0 +1,14 @@
+<html>
+<head>
+<script>
+if (window.layoutTestController) {
+ window.layoutTestController.dumpAsText();
+ window.layoutTestController.addUserScript("console.log('Start Script')", true, true);
+ window.layoutTestController.addUserScript("console.log('End Script')", false, true);
+}
+</script>
+</head>
+<body>
+<iframe src="resources/counting.mp4"></iframe>
+</body>
+</html>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list