Title: [88481] branches/safari-534-branch/Source/WebCore
Diff
Modified: branches/safari-534-branch/Source/WebCore/ChangeLog (88480 => 88481)
--- branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-09 20:53:58 UTC (rev 88480)
+++ branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-09 21:06:13 UTC (rev 88481)
@@ -1,3 +1,22 @@
+2011-06-02 Lucas Forschler <[email protected]>
+
+ Merged 88279.
+
+ 2011-06-07 Jer Noble <[email protected]>
+
+ Reviewed by Eric Carlson.
+
+ Video with poster attribute will not display new frames when scrubbing.
+ https://bugs.webkit.org/show_bug.cgi?id=62036
+
+ Remove our "detection" about the end of a scrub now that there is an explicit seek completion
+ handler available in AVFoundation. Move what we used to do upon detection in timeChanged()
+ into seekCompleted().
+
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundation::timeChanged):
+ (WebCore::MediaPlayerPrivateAVFoundation::seekCompleted):
+
2011-06-07 Lucas Forschler <[email protected]>
Merged 88261.
Modified: branches/safari-534-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (88480 => 88481)
--- branches/safari-534-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2011-06-09 20:53:58 UTC (rev 88480)
+++ branches/safari-534-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2011-06-09 21:06:13 UTC (rev 88481)
@@ -551,29 +551,15 @@
void MediaPlayerPrivateAVFoundation::timeChanged(double time)
{
LOG(Media, "MediaPlayerPrivateAVFoundation::timeChanged(%p) - time = %f", this, time);
-
- if (m_seekTo == invalidTime())
- return;
-
- // AVFoundation may call our observer more than once during a seek, and we can't currently tell
- // if we will be able to seek to an exact time, so assume that we are done seeking if we are
- // "close enough" to the seek time.
- const double smallSeekDelta = 1.0 / 100;
-
- float currentRate = rate();
- if ((currentRate > 0 && time >= m_seekTo) || (currentRate < 0 && time <= m_seekTo) || (abs(m_seekTo - time) <= smallSeekDelta)) {
- m_seekTo = invalidTime();
- updateStates();
- m_player->timeChanged();
- }
}
void MediaPlayerPrivateAVFoundation::seekCompleted(bool finished)
{
LOG(Media, "MediaPlayerPrivateAVFoundation::seekCompleted(%p) - finished = %d", this, finished);
- if (finished)
- m_seekTo = invalidTime();
+ m_seekTo = invalidTime();
+ updateStates();
+ m_player->timeChanged();
}
void MediaPlayerPrivateAVFoundation::didEnd()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
