[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 15:17:18 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9fd7f6a47d0135b1d823dc330c96a71dac173c22
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 29 21:18:21 2010 +0000
2010-10-29 Eric Carlson <eric.carlson at apple.com>
Reviewed by Adam Roben.
Results for media test controls-drag-timebar.html are needlessly platform specific
https://bugs.webkit.org/show_bug.cgi?id=48662
* media/controls-drag-timebar-expected.txt: Added.
* media/controls-drag-timebar.html: Remove all platform specific logging.
* platform/chromium-mac/media/controls-drag-timebar-expected.txt: Removed.
* platform/chromium-win/media/controls-drag-timebar-expected.txt: Removed.
* platform/gtk/media/controls-drag-timebar-expected.txt: Removed.
* platform/mac-leopard/media/controls-drag-timebar-expected.txt: Removed.
* platform/mac-snowleopard/Skipped: Unskip test.
* platform/mac-tiger/media/controls-drag-timebar-expected.txt: Removed.
* platform/mac/media/controls-drag-timebar-expected.txt: Removed.
* platform/win/media/controls-drag-timebar-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70926 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 10855cb..2d5281f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2010-10-29 Eric Carlson <eric.carlson at apple.com>
+
+ Reviewed by Adam Roben.
+
+ Results for media test controls-drag-timebar.html are needlessly platform specific
+ https://bugs.webkit.org/show_bug.cgi?id=48662
+
+ * media/controls-drag-timebar-expected.txt: Added.
+ * media/controls-drag-timebar.html: Remove all platform specific logging.
+ * platform/chromium-mac/media/controls-drag-timebar-expected.txt: Removed.
+ * platform/chromium-win/media/controls-drag-timebar-expected.txt: Removed.
+ * platform/gtk/media/controls-drag-timebar-expected.txt: Removed.
+ * platform/mac-leopard/media/controls-drag-timebar-expected.txt: Removed.
+ * platform/mac-snowleopard/Skipped: Unskip test.
+ * platform/mac-tiger/media/controls-drag-timebar-expected.txt: Removed.
+ * platform/mac/media/controls-drag-timebar-expected.txt: Removed.
+ * platform/win/media/controls-drag-timebar-expected.txt: Removed.
+
2010-10-29 Dmitry Titov <dimich at chromium.org>
[Chromium] Unreviewed test expectations update.
diff --git a/LayoutTests/media/controls-drag-timebar-expected.txt b/LayoutTests/media/controls-drag-timebar-expected.txt
new file mode 100644
index 0000000..ba4b7b4
--- /dev/null
+++ b/LayoutTests/media/controls-drag-timebar-expected.txt
@@ -0,0 +1,33 @@
+Test that dragging the timebar thumb causes seeks.
+
+EVENT(canplaythrough)
+EVENT(seeking)
+EVENT(seeked)
+EXPECTED (previousTime != 'video.currentTime') OK
+
+Dragging mouse 12 pixels right
+EVENT(seeking)
+EVENT(seeked)
+EXPECTED (previousTime != 'video.currentTime') OK
+
+Dragging mouse 14 pixels left
+EVENT(seeking)
+EVENT(seeked)
+EXPECTED (previousTime != 'video.currentTime') OK
+
+Dragging mouse 16 pixels right
+EVENT(seeking)
+EVENT(seeked)
+EXPECTED (previousTime != 'video.currentTime') OK
+
+Dragging mouse 18 pixels left
+EVENT(seeking)
+EVENT(seeked)
+EXPECTED (previousTime != 'video.currentTime') OK
+
+Dragging mouse 20 pixels right
+EVENT(seeking)
+EVENT(seeked)
+EXPECTED (previousTime != 'video.currentTime') OK
+END OF TEST
+
diff --git a/LayoutTests/media/controls-drag-timebar.html b/LayoutTests/media/controls-drag-timebar.html
index 28ae10e..01963fa 100644
--- a/LayoutTests/media/controls-drag-timebar.html
+++ b/LayoutTests/media/controls-drag-timebar.html
@@ -1,67 +1,84 @@
+<!DOCTYPE html>
<html>
<head>
<title>drag timebar test</title>
<script src=media-file.js></script>
<script src=video-test.js></script>
<script>
- var x, y, time, count;
- var seek = 0;
+ var x;
+ var y;
+ var previousTime;
+ var seekCount;
+ var moveCount;
if (window.layoutTestController)
layoutTestController.dumpAsText();
function test()
{
+ previousTime = video.currentTime;
+ seekCount = 0;
+ moveCount = 0;
+
if (window.eventSender) {
- x = video.offsetLeft + (video.offsetWidth / 3);
+ x = video.offsetLeft + (video.offsetWidth / 2);
y = video.offsetTop + video.offsetHeight - 10;
- time = video.currentTime.toFixed(1);
- count = 0;
eventSender.dragMode = false;
eventSender.mouseMoveTo(x, y);
eventSender.mouseDown();
+
+ // Drag mouse off of the slider thumb to make sure it continues to track
+ y += 100;
+ eventSender.mouseMoveTo(x, y);
}
window.setTimeout("move()", 100);
}
function move()
{
+ ++moveCount;
+
+ var delta = (10 + moveCount * 2) * (moveCount % 2 ? 1 : -1);
+ consoleWrite("");
+ consoleWrite("Dragging mouse " + Math.abs(delta) + " pixels " + (delta > 0 ? "right" : "left"));
+
if (window.eventSender) {
- x += 20;
+ x += delta;
eventSender.mouseMoveTo(x, y);
- }
- if (++count >= 3)
- eventSender.mouseUp();
- window.setTimeout("move()", 100);
- }
+ } else if (moveCount > 6 )
+ endTest(); // to allow testing without DRT
- function playing()
- {
- window.setTimeout("test()", 100);
+ previousTime = video.currentTime;
+ window.setTimeout("move()", 100);
}
function seeked()
{
- consoleWrite("Time: " + video.currentTime.toFixed(1));
- if (++seek == 3)
+ // Don't use "testExpected()" so we won't log the times as the floating point result will differ with different engines.
+ reportExpected(previousTime != video.currentTime, "previousTime", "!=", "video.currentTime", previousTime);
+
+ if (++seekCount == 6) {
+ if (window.eventSender)
+ eventSender.mouseUp();
endTest();
+ }
}
function start()
{
findMediaElement();
- waitForEvent('playing', playing);
+ waitForEvent('canplaythrough', test);
+ waitForEvent('seeking');
waitForEvent('seeked', seeked);
- run("video.autoplay = true");
- run("video.src = '" + findMediaFile("video", "content/test") + "'");
+ video.src = findMediaFile("video", "content/test");
}
</script>
</head>
<body onload="start()">
- <p>Test that drag the timebar thumb causes seeks.</p>
- <video controls></video>
+ <p>Test that dragging the timebar thumb causes seeks.</p>
+ <video controls></video>
</body>
</html>
diff --git a/LayoutTests/platform/chromium-mac/media/controls-drag-timebar-expected.txt b/LayoutTests/platform/chromium-mac/media/controls-drag-timebar-expected.txt
deleted file mode 100644
index 8dbf659..0000000
--- a/LayoutTests/platform/chromium-mac/media/controls-drag-timebar-expected.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Test that drag the timebar thumb causes seeks.
-
-RUN(video.autoplay = true)
-RUN(video.src = 'content/test.ogv')
-EVENT(playing)
-EVENT(seeked)
-Time: 2.3
-EVENT(seeked)
-Time: 3.0
-EVENT(seeked)
-Time: 3.8
-END OF TEST
diff --git a/LayoutTests/platform/chromium-win/media/controls-drag-timebar-expected.txt b/LayoutTests/platform/chromium-win/media/controls-drag-timebar-expected.txt
deleted file mode 100644
index 8dbf659..0000000
--- a/LayoutTests/platform/chromium-win/media/controls-drag-timebar-expected.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Test that drag the timebar thumb causes seeks.
-
-RUN(video.autoplay = true)
-RUN(video.src = 'content/test.ogv')
-EVENT(playing)
-EVENT(seeked)
-Time: 2.3
-EVENT(seeked)
-Time: 3.0
-EVENT(seeked)
-Time: 3.8
-END OF TEST
diff --git a/LayoutTests/platform/gtk/media/controls-drag-timebar-expected.txt b/LayoutTests/platform/gtk/media/controls-drag-timebar-expected.txt
deleted file mode 100644
index a41211a..0000000
--- a/LayoutTests/platform/gtk/media/controls-drag-timebar-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Test that drag the timebar thumb causes seeks.
-
-RUN(video.autoplay = true)
-RUN(video.src = 'content/test.mp4')
-EVENT(playing)
-EVENT(seeked)
-Time: 2.4
-EVENT(seeked)
-Time: 3.0
-EVENT(seeked)
-Time: 3.6
-END OF TEST
-
diff --git a/LayoutTests/platform/mac-leopard/media/controls-drag-timebar-expected.txt b/LayoutTests/platform/mac-leopard/media/controls-drag-timebar-expected.txt
deleted file mode 100644
index 1fdf1ad..0000000
--- a/LayoutTests/platform/mac-leopard/media/controls-drag-timebar-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Test that drag the timebar thumb causes seeks.
-
-RUN(video.autoplay = true)
-RUN(video.src = 'content/test.mp4')
-EVENT(playing)
-EVENT(seeked)
-Time: 0.3
-EVENT(seeked)
-Time: 1.1
-EVENT(seeked)
-Time: 1.9
-END OF TEST
-
diff --git a/LayoutTests/platform/mac-snowleopard/Skipped b/LayoutTests/platform/mac-snowleopard/Skipped
index b19a3b4..20fde57 100644
--- a/LayoutTests/platform/mac-snowleopard/Skipped
+++ b/LayoutTests/platform/mac-snowleopard/Skipped
@@ -55,9 +55,6 @@ media/video-controls-zoomed.html
media/video-zoom-controls.html
media/video-display-toggle.html
-#<rdar://problem/7144385> - media/controls-drag-timebar.html fails
-media/controls-drag-timebar.html
-
# This test requires ogg codecs
media/media-can-play-ogg.html
diff --git a/LayoutTests/platform/mac-tiger/media/controls-drag-timebar-expected.txt b/LayoutTests/platform/mac-tiger/media/controls-drag-timebar-expected.txt
deleted file mode 100644
index 3231085..0000000
--- a/LayoutTests/platform/mac-tiger/media/controls-drag-timebar-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Test that drag the timebar thumb causes seeks.
-
-RUN(video.autoplay = true)
-RUN(video.src = 'content/test.mp4')
-EVENT(playing)
-EVENT(seeked)
-Time: 2.1
-EVENT(seeked)
-Time: 2.6
-EVENT(seeked)
-Time: 3.1
-END OF TEST
-
diff --git a/LayoutTests/platform/mac/media/controls-drag-timebar-expected.txt b/LayoutTests/platform/mac/media/controls-drag-timebar-expected.txt
deleted file mode 100644
index 08ea19a..0000000
--- a/LayoutTests/platform/mac/media/controls-drag-timebar-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Test that drag the timebar thumb causes seeks.
-
-RUN(video.autoplay = true)
-RUN(video.src = 'content/test.mp4')
-EVENT(playing)
-EVENT(seeked)
-Time: 1.7
-EVENT(seeked)
-Time: 2.2
-EVENT(seeked)
-Time: 2.7
-END OF TEST
-
diff --git a/LayoutTests/platform/win/media/controls-drag-timebar-expected.txt b/LayoutTests/platform/win/media/controls-drag-timebar-expected.txt
deleted file mode 100644
index 1cbee1b..0000000
--- a/LayoutTests/platform/win/media/controls-drag-timebar-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Test that drag the timebar thumb causes seeks.
-
-RUN(video.autoplay = true)
-RUN(video.src = 'content/test.mp4')
-EVENT(playing)
-EVENT(seeked)
-Time: 2.3
-EVENT(seeked)
-Time: 2.8
-EVENT(seeked)
-Time: 3.3
-END OF TEST
-
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list