Changeset 274559 in webkit

Timestamp:

Mar 17, 2021, 8:20:55 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Set media elements' networkState to NETWORK_IDLE if the connection is interrupted
​https://bugs.webkit.org/show_bug.cgi?id=223242

Patch by Souju TANAKA <​soujyu.tanaka@access-company.com> on 2021-03-17
Reviewed by Eric Carlson.

Media elements' networkState was set to NETWORK_EMPTY if the connection is interrupted after some
media data has been received. This fix changes the state to NETWORK_IDLE, according to recent spec.

No new tests since there seems no way to disconnect network connection during tests.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::mediaLoadingFailedFatally):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-17  Souju TANAKA  <soujyu.tanaka@access-company.com>
+
+        Set media elements' networkState to NETWORK_IDLE if the connection is interrupted
+        https://bugs.webkit.org/show_bug.cgi?id=223242
+
+        Reviewed by Eric Carlson.
+
+        Media elements' networkState was set to NETWORK_EMPTY if the connection is interrupted after some
+        media data has been received. This fix changes the state to NETWORK_IDLE, according to recent spec.
+
+        No new tests since there seems no way to disconnect network connection during tests.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::mediaLoadingFailedFatally):
+
 2021-03-17  Kimmo Kinnunen  <kkinnunen@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -2089 +2089 @@
 void HTMLMediaElement::mediaLoadingFailedFatally(MediaPlayer::NetworkState error)
 {
+    // https://html.spec.whatwg.org/#loading-the-media-resource:dom-media-have_nothing-2
+    // 17 March 2021
+
     // 1 - The user agent should cancel the fetching process.
     stopPeriodicTimers();
@@ -2102 +2105 @@
         ASSERT_NOT_REACHED();
 
-    // 3 - Queue a task to fire a simple event named error at the media element.
-    scheduleEvent(eventNames().errorEvent);
-
 #if ENABLE(MEDIA_SOURCE)
     detachMediaSource();
 #endif
 
-    // 4 - Set the element's networkState attribute to the NETWORK_EMPTY value and queue a
-    // task to fire a simple event called emptied at the element.
-    m_networkState = NETWORK_EMPTY;
-    scheduleEvent(eventNames().emptiedEvent);
-
-    // 5 - Set the element's delaying-the-load-event flag to false. This stops delaying the load event.
+    // 3 - Set the element's networkState attribute to the NETWORK_IDLE value.
+    m_networkState = NETWORK_IDLE;
+
+    // 4 - Set the element's delaying-the-load-event flag to false. This stops delaying the load event.
     setShouldDelayLoadEvent(false);
+
+    // 5 - Fire an event named error at the media element.
+    dispatchEvent(Event::create(eventNames().errorEvent, Event::CanBubble::No, Event::IsCancelable::No));
 
     // 6 - Abort the overall resource selection algorithm.