[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
eric.carlson at apple.com
eric.carlson at apple.com
Wed Dec 22 12:43:58 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 57f32021bdbfb39c8e8b381aa00307895c77589e
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Aug 27 23:14:44 2010 +0000
2010-08-27 Eric Carlson <eric.carlson at apple.com>
Reviewed by Simon Fraser.
Allow ports to use different test movies.
https://bugs.webkit.org/show_bug.cgi?id=44799
Move test movies from http/tests/media/resources to http/tests/resources. Change
local-video-source-from-remote to load a movie supported by the platform and to
not log movie name.
* http/tests/media/resources/test.mp4: Removed.
* http/tests/media/resources/test.ogv: Removed.
* http/tests/media/video-cancel-load.html:
* http/tests/media/video-cookie.html:
* http/tests/media/video-error-abort.html:
* http/tests/media/video-load-twice.html:
* http/tests/media/video-play-suspend.html:
* http/tests/media/video-referer.html:
* http/tests/resources/silence.mpg: Removed.
* http/tests/resources/test.mp4: Copied from LayoutTests/http/tests/media/resources/test.mp4.
* http/tests/resources/test.ogv: Copied from LayoutTests/http/tests/media/resources/test.ogv.
* http/tests/security/local-video-source-from-remote-expected.txt:
* http/tests/security/local-video-source-from-remote.html:
* media/video-source-error.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66271 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e6f605f..61a626a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,31 @@
2010-08-27 Eric Carlson <eric.carlson at apple.com>
+ Reviewed by Simon Fraser.
+
+ Allow ports to use different test movies.
+ https://bugs.webkit.org/show_bug.cgi?id=44799
+
+ Move test movies from http/tests/media/resources to http/tests/resources. Change
+ local-video-source-from-remote to load a movie supported by the platform and to
+ not log movie name.
+
+ * http/tests/media/resources/test.mp4: Removed.
+ * http/tests/media/resources/test.ogv: Removed.
+ * http/tests/media/video-cancel-load.html:
+ * http/tests/media/video-cookie.html:
+ * http/tests/media/video-error-abort.html:
+ * http/tests/media/video-load-twice.html:
+ * http/tests/media/video-play-suspend.html:
+ * http/tests/media/video-referer.html:
+ * http/tests/resources/silence.mpg: Removed.
+ * http/tests/resources/test.mp4: Copied from LayoutTests/http/tests/media/resources/test.mp4.
+ * http/tests/resources/test.ogv: Copied from LayoutTests/http/tests/media/resources/test.ogv.
+ * http/tests/security/local-video-source-from-remote-expected.txt:
+ * http/tests/security/local-video-source-from-remote.html:
+ * media/video-source-error.html:
+
+2010-08-27 Eric Carlson <eric.carlson at apple.com>
+
Rubber-stamped Simon Fraser.
Set svn mime-type on two test movies.
diff --git a/LayoutTests/http/tests/media/video-cancel-load.html b/LayoutTests/http/tests/media/video-cancel-load.html
index 54e6f8e..1b7054f 100644
--- a/LayoutTests/http/tests/media/video-cancel-load.html
+++ b/LayoutTests/http/tests/media/video-cancel-load.html
@@ -32,7 +32,7 @@
}
var video = document.getElementById("video");
- var file = findMediaFile("video", "resources/test");
+ var file = findMediaFile("video", "../resources/test");
// Opens a window and writes the child content into the document.
video.addEventListener("loadedmetadata", function main()
diff --git a/LayoutTests/http/tests/media/video-cookie.html b/LayoutTests/http/tests/media/video-cookie.html
index 8d5408d..a804165 100644
--- a/LayoutTests/http/tests/media/video-cookie.html
+++ b/LayoutTests/http/tests/media/video-cookie.html
@@ -13,7 +13,7 @@
}
function loadCookie () {
- var movie = findMediaFile("video", "resources/test");
+ var movie = findMediaFile("video", "../resources/test");
var frame = document.createElement("iframe");
document.body.appendChild(frame);
diff --git a/LayoutTests/http/tests/media/video-error-abort.html b/LayoutTests/http/tests/media/video-error-abort.html
index 466fc0a..79d35c5 100644
--- a/LayoutTests/http/tests/media/video-error-abort.html
+++ b/LayoutTests/http/tests/media/video-error-abort.html
@@ -49,7 +49,7 @@
consoleWrite("<br><b>Test before movie is open</b>");
testExpected("video.error", null);
- var movie = findMediaFile("video", "resources/test");
+ var movie = findMediaFile("video", "../resources/test");
video.src = "http://127.0.0.1:8000/media/video-throttled-load.cgi?name=" + movie + "&throttle=256";
}
</script>
diff --git a/LayoutTests/http/tests/media/video-load-twice.html b/LayoutTests/http/tests/media/video-load-twice.html
index 8a0542f..0337035 100644
--- a/LayoutTests/http/tests/media/video-load-twice.html
+++ b/LayoutTests/http/tests/media/video-load-twice.html
@@ -3,7 +3,7 @@
<script src=../../../media/media-file.js></script>
<script src=../../../media/video-test.js></script>
<script>
- var file = findMediaFile("video", "http://127.0.0.1:8000/media/resources/test");
+ var file = findMediaFile("video", "http://127.0.0.1:8000/resources/test");
function createVideo() {
var video = document.createElement("video");
diff --git a/LayoutTests/http/tests/media/video-play-suspend.html b/LayoutTests/http/tests/media/video-play-suspend.html
index 198a655..bc25c1d 100644
--- a/LayoutTests/http/tests/media/video-play-suspend.html
+++ b/LayoutTests/http/tests/media/video-play-suspend.html
@@ -24,7 +24,7 @@
} );
var mediaFile = findMediaFile("video", "resources/test");
- video.src = "http://127.0.0.1:8000/media/" + mediaFile;
+ video.src = "http://127.0.0.1:8000/" + mediaFile;
run("video.play()");
}
</script>
diff --git a/LayoutTests/http/tests/media/video-referer.html b/LayoutTests/http/tests/media/video-referer.html
index a4de911..b3adf88 100644
--- a/LayoutTests/http/tests/media/video-referer.html
+++ b/LayoutTests/http/tests/media/video-referer.html
@@ -13,7 +13,7 @@
}
function loadCookieAndReferer () {
- var movie = findMediaFile("video", "resources/test");
+ var movie = findMediaFile("video", "../resources/test");
var frame = document.createElement("iframe");
document.body.appendChild(frame);
diff --git a/LayoutTests/http/tests/resources/silence.mpg b/LayoutTests/http/tests/resources/silence.mpg
deleted file mode 100644
index b6bbf20..0000000
Binary files a/LayoutTests/http/tests/resources/silence.mpg and /dev/null differ
diff --git a/LayoutTests/http/tests/security/local-video-source-from-remote-expected.txt b/LayoutTests/http/tests/security/local-video-source-from-remote-expected.txt
index 7dd1645..19f44e8 100644
--- a/LayoutTests/http/tests/security/local-video-source-from-remote-expected.txt
+++ b/LayoutTests/http/tests/security/local-video-source-from-remote-expected.txt
@@ -4,8 +4,6 @@ Test that a remote video element will not use a local <source>, and will use ano
This test only behaves correctly in DRT
EVENT(loadedmetadata)
-url http://localhost:8000/resources/silence.mpg loaded.
-
SUCCESS: remote movie loaded, local movie failed to load
END OF TEST
diff --git a/LayoutTests/http/tests/security/local-video-source-from-remote.html b/LayoutTests/http/tests/security/local-video-source-from-remote.html
index 91c411e..a5c5f40 100644
--- a/LayoutTests/http/tests/security/local-video-source-from-remote.html
+++ b/LayoutTests/http/tests/security/local-video-source-from-remote.html
@@ -61,7 +61,7 @@
}
var localMovie = "file:///tmp/LayoutTests/media/content/scaled-matrix.mov";
- var remoteUrl = "http://localhost:8000/resources/silence.mpg";
+ var remoteUrl = "http://localhost:8000/resources/test";
function loadedmetadata(evt)
{
@@ -70,7 +70,6 @@
var remoteFile = remoteUrl.substring(remoteUrl.lastIndexOf("/")+1, remoteUrl.length)
logEvent(evt);
- consoleWrite("url " + src + " loaded.<br>");
if (src.indexOf(localFile) > 0)
logResult("local movie loaded", false);
else if (src.indexOf(remoteFile) > 0)
@@ -98,6 +97,15 @@
var src1 = document.createElement("source");
src1.setAttribute("src", localMovie);
+ if (video.canPlayType("video/mp4"))
+ remoteUrl += ".mp4";
+ else if (video.canPlayType("video/ogg"))
+ remoteUrl += ".ogv";
+ else {
+ logResult("Missing test movie for this platform???", false);
+ endTest();
+ }
+
var src2 = document.createElement("source");
src2.setAttribute("src", remoteUrl);
diff --git a/LayoutTests/media/video-source-error.html b/LayoutTests/media/video-source-error.html
index 47ad6d1..bc56018 100644
--- a/LayoutTests/media/video-source-error.html
+++ b/LayoutTests/media/video-source-error.html
@@ -55,7 +55,7 @@
</script>
</head>
- <body onload="start()">
+ <body>
<video controls>
<source id=missing-src type="video/blahblah">
@@ -72,5 +72,6 @@
<br>2. Verifiy that an 'error' event fired while processing/loading a <source> element
does not set the media element's 'error' attribute.</p>
+ <script>start()</script>
</body>
</html>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list