The following commit has been merged in the debian/experimental branch:
commit a4815f1d79ad8d6897731bc6cb701ad5e73baa6a
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 13 21:57:49 2010 +0000
2010-12-13 Eric Carlson <eric.carlson at apple.com>
Reviewed by Antti Koivisto.
HTMLMediaElement::endedPlayback should not return true if duration is zero
https://bugs.webkit.org/show_bug.cgi?id=50962
(WebCore::HTMLMediaElement::endedPlayback): Don't return true when duration is zero because a
media file can't play if it has no duration, therefore it can't have ended playback.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73957 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 59a5549..1d2c5e3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-13 Eric Carlson <eric.carlson at apple.com>
+
+ Reviewed by Antti Koivisto.
+
+ HTMLMediaElement::endedPlayback should not return true if duration is zero
+ https://bugs.webkit.org/show_bug.cgi?id=50962
+
+ (WebCore::HTMLMediaElement::endedPlayback): Don't return true when duration is zero because a
+ media file can't play if it has no duration, therefore it can't have ended playback.
+
2010-12-13 Brent Fulgham <bfulgham at webkit.org>
Unreviewed build fix after r73840.
diff --git a/WebCore/html/HTMLMediaElement.cpp b/WebCore/html/HTMLMediaElement.cpp
index 4962f8e..d6e8440 100644
--- a/WebCore/html/HTMLMediaElement.cpp
+++ b/WebCore/html/HTMLMediaElement.cpp
@@ -2025,13 +2025,13 @@ bool HTMLMediaElement::endedPlayback() const
// readyState attribute is HAVE_METADATA or greater,
if (m_readyState < HAVE_METADATA)
return false;
-
- // and the current playback position is the end of the media resource and the direction
+
+ // and the current playback position is the end of the media resource and the direction
// of playback is forwards and the media element does not have a loop attribute specified,
float now = currentTime();
if (m_playbackRate > 0)
- return now >= dur && !loop();
-
+ return dur > 0 && now >= dur && !loop();
+
// or the current playback position is the earliest possible position and the direction
// of playback is backwards
if (m_playbackRate < 0)
--
WebKit Debian packaging