Changeset 166282 in webkit

Timestamp:

Mar 25, 2014 9:16:53 PM (10 years ago)

Author:

jer.noble@apple.com

Message:

[MSE] Duplicate 'seeked' events.
​https://bugs.webkit.org/show_bug.cgi?id=130754

Reviewed by Eric Carlson.

Source/WebCore:

Test: media/media-source/media-source-duplicate-seeked.html

During certain seek operations, HTMLMediaElement::finishSeek() can be called re-entrantly due to
the ready state changing as a result of MediaSource::monitorSourceBuffers(). Move this call to the
end of finishSeek() after m_seeking has been cleared.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::parseAttribute):

LayoutTests:

• media/media-source/media-source-duplicate-seeked-expected.txt: Added.
• media/media-source/media-source-duplicate-seeked.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/media-source/media-source-duplicate-seeked-expected.txt (added)
• LayoutTests/media/media-source/media-source-duplicate-seeked.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-03-25  Jer Noble  <jer.noble@apple.com>
+
+        [MSE] Duplicate 'seeked' events.
+        https://bugs.webkit.org/show_bug.cgi?id=130754
+
+        Reviewed by Eric Carlson.
+
+        * media/media-source/media-source-duplicate-seeked-expected.txt: Added.
+        * media/media-source/media-source-duplicate-seeked.html: Added.
+
 2014-03-25  James Craig  <jcraig@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-25  Jer Noble  <jer.noble@apple.com>
+
+        [MSE] Duplicate 'seeked' events.
+        https://bugs.webkit.org/show_bug.cgi?id=130754
+
+        Reviewed by Eric Carlson.
+
+        Test: media/media-source/media-source-duplicate-seeked.html
+
+        During certain seek operations, HTMLMediaElement::finishSeek() can be called re-entrantly due to
+        the ready state changing as a result of MediaSource::monitorSourceBuffers(). Move this call to the
+        end of finishSeek() after m_seeking has been cleared.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::parseAttribute):
+
 2014-03-25  James Craig  <jcraig@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -2482 +2482 @@
     LOG(Media, "HTMLMediaElement::finishSeek");
 
+    // 4.8.10.9 Seeking
+    // 14 - Set the seeking IDL attribute to false.
+    m_seeking = false;
+
+    // 15 - Run the time maches on steps.
+    // Handled by mediaPlayerTimeChanged().
+
+    // 16 - Queue a task to fire a simple event named timeupdate at the element.
+    scheduleEvent(eventNames().timeupdateEvent);
+
+    // 17 - Queue a task to fire a simple event named seeked at the element.
+    scheduleEvent(eventNames().seekedEvent);
+
 #if ENABLE(MEDIA_SOURCE)
     if (m_mediaSource)
         m_mediaSource->monitorSourceBuffers();
 #endif
-
-    // 4.8.10.9 Seeking
-    // 14 - Set the seeking IDL attribute to false.
-    m_seeking = false;
-
-    // 15 - Run the time maches on steps.
-    // Handled by mediaPlayerTimeChanged().
-
-    // 16 - Queue a task to fire a simple event named timeupdate at the element.
-    scheduleEvent(eventNames().timeupdateEvent);
-
-    // 17 - Queue a task to fire a simple event named seeked at the element.
-    scheduleEvent(eventNames().seekedEvent);
 }