Changeset 218268 in webkit

Timestamp:

Jun 14, 2017 10:32:48 AM (7 years ago)

Author:

jer.noble@apple.com

Message:

Flaky Test: media/media-source/media-source-unnecessary-seek-seeked.html
​https://bugs.webkit.org/show_bug.cgi?id=173344

Reviewed by Eric Carlson.

Separate the concept of "the page has asked us to seek" from "we have asked the
media player to seek". When the media engine tells us its ready state has changed
after the page has requested a seek, but before the media element has asked its
player to perform the seek, we were previously firing a seeked event. Now we'll
check this new ivar and see that we aren't expecting a seek to finish yet.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::HTMLMediaElement):
(WebCore::HTMLMediaElement::setReadyState):
(WebCore::HTMLMediaElement::finishSeek):
(WebCore::HTMLMediaElement::mediaPlayerTimeChanged):

• html/HTMLMediaElement.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (5 diffs)
• html/HTMLMediaElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-06-14  Jer Noble  <jer.noble@apple.com>
+
+        Flaky Test: media/media-source/media-source-unnecessary-seek-seeked.html
+        https://bugs.webkit.org/show_bug.cgi?id=173344
+
+        Reviewed by Eric Carlson.
+
+        Separate the concept of "the page has asked us to seek" from "we have asked the
+        media player to seek". When the media engine tells us its ready state has changed
+        after the page has requested a seek, but before the media element has asked its
+        player to perform the seek, we were previously firing a seeked event. Now we'll
+        check this new ivar and see that we aren't expecting a seek to finish yet.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::HTMLMediaElement):
+        (WebCore::HTMLMediaElement::setReadyState):
+        (WebCore::HTMLMediaElement::finishSeek):
+        (WebCore::HTMLMediaElement::mediaPlayerTimeChanged):
+        * html/HTMLMediaElement.h:
+
 2017-06-14  Matt Lewis  <jlewis3@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -416 +416 @@
     , m_paused(true)
     , m_seeking(false)
+    , m_seekRequested(false)
     , m_sentStalledEvent(false)
     , m_sentEndEvent(false)
@@ -2364 +2365 @@
 
         // 4.8.10.10 step 14 & 15.
-        if (!m_player->seeking() && m_readyState >= HAVE_CURRENT_DATA)
+        if (m_seekRequested && !m_player->seeking() && m_readyState >= HAVE_CURRENT_DATA)
             finishSeek();
     } else {
@@ -2756 +2757 @@
 
     // 11 - Set the current playback position to the given new playback position
+    m_seekRequested = true;
     m_player->seekWithTolerance(time, negativeTolerance, positiveTolerance);
 
@@ -2766 +2768 @@
 {
     m_seeking = false;
+    m_seekRequested = false;
     m_pendingSeekType = NoSeek;
     invalidateCachedTime();
@@ -4419 +4422 @@
 
     // 4.8.10.9 step 14 & 15.  Needed if no ReadyState change is associated with the seek.
-    if (m_seeking && m_readyState >= HAVE_CURRENT_DATA && !m_player->seeking())
+    if (m_seekRequested && m_readyState >= HAVE_CURRENT_DATA && !m_player->seeking())
         finishSeek();
     

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -996 +996 @@
     bool m_paused : 1;
     bool m_seeking : 1;
+    bool m_seekRequested : 1;
 
     // data has not been loaded since sending a "stalled" event