[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 15:13:26 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit a9ee6130544e2e9946e6c0f1beb752a6b1862c51
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 29 03:50:24 2010 +0000
2010-10-28 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r70814.
http://trac.webkit.org/changeset/70814
https://bugs.webkit.org/show_bug.cgi?id=48612
Caused media/controls-drag-timebar.html to fail on multiple
platforms (Requested by aroben on #webkit).
* media/video-seek-by-small-increment-expected.txt: Removed.
* media/video-seek-by-small-increment.html: Removed.
2010-10-28 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r70814.
http://trac.webkit.org/changeset/70814
https://bugs.webkit.org/show_bug.cgi?id=48612
Caused media/controls-drag-timebar.html to fail on multiple
platforms (Requested by aroben on #webkit).
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::seek):
* platform/graphics/MediaPlayer.cpp:
* platform/graphics/MediaPlayer.h:
* platform/graphics/MediaPlayerPrivate.h:
* platform/graphics/mac/MediaPlayerPrivateQTKit.h:
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
* platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
* platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h:
* platform/graphics/win/QTMovie.cpp:
* platform/graphics/win/QTMovie.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70837 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9814a15..420c093 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-28 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r70814.
+ http://trac.webkit.org/changeset/70814
+ https://bugs.webkit.org/show_bug.cgi?id=48612
+
+ Caused media/controls-drag-timebar.html to fail on multiple
+ platforms (Requested by aroben on #webkit).
+
+ * media/video-seek-by-small-increment-expected.txt: Removed.
+ * media/video-seek-by-small-increment.html: Removed.
+
2010-10-28 James Robinson <jamesr at chromium.org>
Update the pixel expectations for fast/tables for the Mac port.
diff --git a/LayoutTests/media/video-seek-by-small-increment-expected.txt b/LayoutTests/media/video-seek-by-small-increment-expected.txt
deleted file mode 100644
index c3f8049..0000000
--- a/LayoutTests/media/video-seek-by-small-increment-expected.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Test seeking by very small increments.
-
-EVENT(canplaythrough)
-EXPECTED (seekedEventCount == '0') OK
-EVENT(seeking)
-EVENT(seeked)
-EXPECTED (seekedEventCount == '1') OK
-EVENT(seeking)
-EVENT(seeked)
-EXPECTED (seekedEventCount == '2') OK
-EVENT(seeking)
-EVENT(seeked)
-EXPECTED (seekedEventCount == '3') OK
-EVENT(seeking)
-EVENT(seeked)
-EXPECTED (seekedEventCount == '4') OK
-EVENT(seeking)
-EVENT(seeked)
-EXPECTED (seekedEventCount == '5') OK
-EVENT(seeking)
-EVENT(seeked)
-EXPECTED (seekedEventCount == '6') OK
-EVENT(seeking)
-EVENT(seeked)
-EXPECTED (seekedEventCount == '7') OK
-EVENT(seeking)
-EVENT(seeked)
-EXPECTED (seekedEventCount == '8') OK
-EVENT(seeking)
-EVENT(seeked)
-EXPECTED (seekedEventCount == '9') OK
-EVENT(seeking)
-EVENT(seeked)
-EXPECTED (seekedEventCount == '10') OK
-END OF TEST
-
diff --git a/LayoutTests/media/video-seek-by-small-increment.html b/LayoutTests/media/video-seek-by-small-increment.html
deleted file mode 100644
index 1f9322e..0000000
--- a/LayoutTests/media/video-seek-by-small-increment.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE HTML>
-<html>
- <head>
- <script src=media-file.js></script>
- <script src=video-test.js></script>
-
- <script>
- var seekedEventCount = 0;
- var seeksAttempted = 0;
- var increment = 0.0004;
-
- function seekIncrement()
- {
- // We want to verify that seeking by an increment smaller than the test movie's time scale
- // succeeds. test.mp4 has a time scale of 2500 (the smallest unit of time in that file
- // is 0.0004 seconds), so start with that and decrease by half each time.
- increment /= 2;
- return increment;
- }
-
- function seeked()
- {
- ++seekedEventCount;
- }
-
- function attemptSeek()
- {
- var now = video.currentTime;
-
- video.currentTime = now + seekIncrement();
- ++seeksAttempted;
- setTimeout(testAgain, 10);
- }
-
- function testAgain()
- {
- reportExpected(seeksAttempted == seekedEventCount, "seekedEventCount", "==", seeksAttempted, seekedEventCount);
-
- if (seeksAttempted == 10) {
- endTest();
- return;
- }
-
- setTimeout(attemptSeek, 100);
- }
-
- function start()
- {
- findMediaElement();
- video.src = findMediaFile("video", "content/test");
-
- waitForEvent('canplaythrough', testAgain);
- waitForEvent('seeked', seeked);
- waitForEvent('seeking');
- waitForEvent('play');
- waitForEvent('pause');
- }
- </script>
- </head>
- <body>
- <video controls></video>
- <p>Test seeking by very small increments.</p>
- <script>start()</script>
- </body>
-</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1e33eb5..791b65a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2010-10-28 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r70814.
+ http://trac.webkit.org/changeset/70814
+ https://bugs.webkit.org/show_bug.cgi?id=48612
+
+ Caused media/controls-drag-timebar.html to fail on multiple
+ platforms (Requested by aroben on #webkit).
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::seek):
+ * platform/graphics/MediaPlayer.cpp:
+ * platform/graphics/MediaPlayer.h:
+ * platform/graphics/MediaPlayerPrivate.h:
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+ * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
+ * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h:
+ * platform/graphics/win/QTMovie.cpp:
+ * platform/graphics/win/QTMovie.h:
+
2010-10-28 Dan Bernstein <mitz at apple.com>
Reviewed by Simon Fraser.
diff --git a/WebCore/html/HTMLMediaElement.cpp b/WebCore/html/HTMLMediaElement.cpp
index 30bd31d..daabc27 100644
--- a/WebCore/html/HTMLMediaElement.cpp
+++ b/WebCore/html/HTMLMediaElement.cpp
@@ -1113,18 +1113,6 @@ void HTMLMediaElement::seek(float time, ExceptionCode& ec)
float earliestTime = m_player->startTime();
time = max(time, earliestTime);
- // Ask the media engine for the time value in the movie's time scale before comparing with current time. This
- // is necessary because if the seek time is not equal to currentTime but the delta is less than the movie's
- // time scale, we will ask the media engine to "seek" to the current movie time, which may be a noop and
- // not generate a timechanged callback. This means m_seeking will never be cleared and we will never
- // fire a 'seeked' event.
-#if !LOG_DISABLED
- float mediaTime = m_player->mediaTimeForTimeValue(time);
- if (time != mediaTime)
- LOG(Media, "HTMLMediaElement::seek(%f) - media timeline equivalent is %f", time, mediaTime);
-#endif
- time = m_player->mediaTimeForTimeValue(time);
-
// 7 - If the (possibly now changed) new playback position is not in one of the ranges given in the
// seekable attribute, then let it be the position in one of the ranges given in the seekable attribute
// that is the nearest to the new playback position. ... If there are no ranges given in the seekable
diff --git a/WebCore/platform/graphics/MediaPlayer.cpp b/WebCore/platform/graphics/MediaPlayer.cpp
index 4e3e88e..2a9e64e 100644
--- a/WebCore/platform/graphics/MediaPlayer.cpp
+++ b/WebCore/platform/graphics/MediaPlayer.cpp
@@ -643,11 +643,6 @@ MediaPlayer::MovieLoadType MediaPlayer::movieLoadType() const
return m_private->movieLoadType();
}
-float MediaPlayer::mediaTimeForTimeValue(float timeValue) const
-{
- return m_private->mediaTimeForTimeValue(timeValue);
-}
-
// Client callbacks.
void MediaPlayer::networkStateChanged()
{
diff --git a/WebCore/platform/graphics/MediaPlayer.h b/WebCore/platform/graphics/MediaPlayer.h
index 150c6ca..c2d0a00 100644
--- a/WebCore/platform/graphics/MediaPlayer.h
+++ b/WebCore/platform/graphics/MediaPlayer.h
@@ -274,8 +274,6 @@ public:
bool hasSingleSecurityOrigin() const;
- float mediaTimeForTimeValue(float) const;
-
private:
MediaPlayer(MediaPlayerClient*);
diff --git a/WebCore/platform/graphics/MediaPlayerPrivate.h b/WebCore/platform/graphics/MediaPlayerPrivate.h
index 6a74714..a8d9b86 100644
--- a/WebCore/platform/graphics/MediaPlayerPrivate.h
+++ b/WebCore/platform/graphics/MediaPlayerPrivate.h
@@ -125,10 +125,6 @@ public:
virtual void prepareForRendering() { }
- // Time value in the movie's time scale. It is only necessary to override this if the media
- // engine uses rational numbers to represent media time.
- virtual float mediaTimeForTimeValue(float timeValue) const { return timeValue; }
-
};
}
diff --git a/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h b/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h
index 876bc16..3895a00 100644
--- a/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h
+++ b/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h
@@ -173,8 +173,6 @@ private:
bool isReadyForVideoSetup() const;
- virtual float mediaTimeForTimeValue(float) const;
-
MediaPlayer* m_player;
RetainPtr<QTMovie> m_qtMovie;
RetainPtr<QTMovieView> m_qtMovieView;
diff --git a/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm b/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
index 06c7924..7b0e7af 100644
--- a/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
+++ b/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
@@ -1540,15 +1540,6 @@ void MediaPlayerPrivate::setPreload(MediaPlayer::Preload preload)
resumeLoad();
}
-float MediaPlayerPrivate::mediaTimeForTimeValue(float timeValue) const
-{
- if (!metaDataAvailable())
- return timeValue;
-
- QTTime qttime = createQTTime(timeValue);
- return static_cast<float>(qttime.timeValue) / qttime.timeScale;
-}
-
} // namespace WebCore
@implementation WebCoreMovieObserver
diff --git a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
index 34a8817..5544229 100644
--- a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
+++ b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
@@ -1053,16 +1053,6 @@ void MediaPlayerPrivateQuickTimeVisualContext::setPreload(MediaPlayer::Preload p
resumeLoad();
}
-float MediaPlayerPrivateQuickTimeVisualContext::mediaTimeForTimeValue(float timeValue) const
-{
- long timeScale;
- if (m_readyState < MediaPlayer::HaveMetadata || !(timeScale = m_movie->timeScale()))
- return timeValue;
-
- long mediaTimeValue = static_cast<long>(timeValue * timeScale);
- return static_cast<float>(mediaTimeValue) / timeScale;
-}
-
MediaPlayerPrivateQuickTimeVisualContext::MediaRenderingMode MediaPlayerPrivateQuickTimeVisualContext::currentRenderingMode() const
{
if (!m_movie)
diff --git a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h
index 43d5bd5..109fd0b 100644
--- a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h
+++ b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h
@@ -173,8 +173,6 @@ private:
void retrieveAndResetMovieTransform();
- virtual float mediaTimeForTimeValue(float) const;
-
MediaPlayer* m_player;
RefPtr<QTMovie> m_movie;
#if USE(ACCELERATED_COMPOSITING)
diff --git a/WebCore/platform/graphics/win/QTMovie.cpp b/WebCore/platform/graphics/win/QTMovie.cpp
index e425bf8..375d8c2 100644
--- a/WebCore/platform/graphics/win/QTMovie.cpp
+++ b/WebCore/platform/graphics/win/QTMovie.cpp
@@ -738,14 +738,6 @@ void QTMovie::setClosedCaptionsVisible(bool visible)
QTSetTrackProperty(ccTrack, closedCaptionTrackType, closedCaptionDisplayPropertyID, sizeof(doDisplay), &doDisplay);
}
-long QTMovie::timeScale() const
-{
- if (!m_private->m_movie)
- return 0;
-
- return GetMovieTimeScale(m_private->m_movie);
-}
-
static void initializeSupportedTypes()
{
if (gSupportedTypes)
diff --git a/WebCore/platform/graphics/win/QTMovie.h b/WebCore/platform/graphics/win/QTMovie.h
index 5e4c4e7..e205b68 100644
--- a/WebCore/platform/graphics/win/QTMovie.h
+++ b/WebCore/platform/graphics/win/QTMovie.h
@@ -115,8 +115,6 @@ public:
Movie getMovieHandle() const;
- long timeScale() const;
-
private:
QTMoviePrivate* m_private;
friend class QTMoviePrivate;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list