Skip to content
Permalink
Browse files
2010-10-28 Sheriff Bot <webkit.review.bot@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@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:

Canonical link: https://commits.webkit.org/61347@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@70837 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
webkit-commit-queue committed Oct 29, 2010
1 parent 9c4aa0e commit 15cc364b2cba81be7281947d0f9414583e7808f7
Showing 14 changed files with 33 additions and 157 deletions.
@@ -1,3 +1,15 @@
2010-10-28 Sheriff Bot <webkit.review.bot@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@chromium.org>

Update the pixel expectations for fast/tables for the Mac port.

This file was deleted.

This file was deleted.

@@ -1,3 +1,24 @@
2010-10-28 Sheriff Bot <webkit.review.bot@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@apple.com>

Reviewed by Simon Fraser.
@@ -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
@@ -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()
{
@@ -274,8 +274,6 @@ class MediaPlayer : public Noncopyable {

bool hasSingleSecurityOrigin() const;

float mediaTimeForTimeValue(float) const;

private:
MediaPlayer(MediaPlayerClient*);

@@ -125,10 +125,6 @@ class MediaPlayerPrivateInterface : public Noncopyable {

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; }

};

}
@@ -173,8 +173,6 @@ class MediaPlayerPrivate : public MediaPlayerPrivateInterface {

bool isReadyForVideoSetup() const;

virtual float mediaTimeForTimeValue(float) const;

MediaPlayer* m_player;
RetainPtr<QTMovie> m_qtMovie;
RetainPtr<QTMovieView> m_qtMovieView;
@@ -1540,15 +1540,6 @@ static void addFileTypesToCache(NSArray * fileTypes, HashSet<String> &cache)
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
@@ -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)
@@ -173,8 +173,6 @@ class MediaPlayerPrivateQuickTimeVisualContext : public MediaPlayerPrivateInterf

void retrieveAndResetMovieTransform();

virtual float mediaTimeForTimeValue(float) const;

MediaPlayer* m_player;
RefPtr<QTMovie> m_movie;
#if USE(ACCELERATED_COMPOSITING)
@@ -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)
@@ -115,8 +115,6 @@ class QTMOVIEWIN_API QTMovie : public RefCounted<QTMovie> {

Movie getMovieHandle() const;

long timeScale() const;

private:
QTMoviePrivate* m_private;
friend class QTMoviePrivate;

0 comments on commit 15cc364

Please sign in to comment.