Changeset 188424 in webkit

Timestamp:

Aug 13, 2015 6:06:02 PM (9 years ago)

Author:

bshafiei@apple.com

Message:

Merged r188416. rdar://problem/21367467

Location:

branches/safari-601.1-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (1 diff)

branches/safari-601.1-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-08-13  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r188416.
+
+    2015-08-13  Jer Noble  <jer.noble@apple.com>
+
+            Don't short circuit seeking
+            https://bugs.webkit.org/show_bug.cgi?id=147892
+
+            Reviewed by Eric Carlson.
+
+            When two seekWithTolerance() requests come in before the first is acted upon in seekTask(),
+            the second will result in a "no seek required" conditional, because the new "currentTime" is
+            assumed to be the destination time of the first seek.
+
+            When cancelling a pending seek, first replace the "now" value with the "now" value from the
+            replaced seek, thus preserving the original currentTime across all replacement seeks.
+
+            Drive-by fix: some added logging causes occasional crashes, due to the underlying object being
+            accessed having been deleted.
+
+            * html/HTMLMediaElement.cpp:
+            (WebCore::HTMLMediaElement::seekWithTolerance):
+            * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+            (WebCore::MediaPlayerPrivateAVFoundationObjC::seekToTime):
+
 2015-08-13  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-601.1-branch/Source/WebCore/html/HTMLMediaElement.cpp

@@ -2447 +2447 @@
         LOG(Media, "HTMLMediaElement::seekWithTolerance(%p) - cancelling pending seeks", this);
         m_seekTaskQueue.cancelAllTasks();
-        m_pendingSeek = nullptr;
+        if (m_pendingSeek) {
+            now = m_pendingSeek->now;
+            m_pendingSeek = nullptr;
+        }
         m_pendingSeekType = NoSeek;
     }

branches/safari-601.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

@@ -1309 +1309 @@
 
     [m_avPlayerItem.get() seekToTime:cmTime toleranceBefore:cmBefore toleranceAfter:cmAfter completionHandler:^(BOOL finished) {
-        double currentTime = CMTimeGetSeconds([m_avPlayerItem currentTime]);
-        callOnMainThread([weakThis, finished, currentTime] {
-            UNUSED_PARAM(currentTime);
+        callOnMainThread([weakThis, finished] {
             auto _this = weakThis.get();
-            LOG(Media, "MediaPlayerPrivateAVFoundationObjC::seekToTime(%p) - completion handler called, currentTime = %f", _this, currentTime);
             if (!_this)
                 return;