Attachment 339468 Details for Bug 185268 – Patch

[patch] Patch

bug-185268-20180503144043.patch (text/plain), 3.88 KB, created by Eric Carlson on 2018-05-03 14:40:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Carlson

Created: 2018-05-03 14:40:44 PDT

Size: 3.88 KB

patch

obsolete

>Subversion Revision: 231259
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 213b185ecfdd6987dd7bfd3bd43d110d0fd6ac7c..d373d7b42201d1c21fdcd23a4caab200dd1b6868 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-05-03  Eric Carlson  <eric.carlson@apple.com>
>+
>+        [iOS] Internal text and audio tracks not in fullscreen menu
>+        https://bugs.webkit.org/show_bug.cgi?id=185268
>+        <rdar://problem/38673440>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/cocoa/PlaybackSessionModelMediaElement.mm:
>+        (WebCore::PlaybackSessionModelMediaElement::setMediaElement): 'addtrack' and 'removetrack'
>+        events are fired at the track lists, not the media element.
>+
> 2018-05-02  Myles C. Maxfield  <mmaxfield@apple.com>
> 
>         Collection fragment identifiers don't use PostScript names
>diff --git a/Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.mm b/Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.mm
>index 79a030cabcc3760507df6e42c8e4386e38428507..87b5109a503eb45a5f3cea6e8bd795071684fc56 100644
>--- a/Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.mm
>+++ b/Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.mm
>@@ -61,11 +61,20 @@ void PlaybackSessionModelMediaElement::setMediaElement(HTMLMediaElement* mediaEl
>     if (m_mediaElement == mediaElement)
>         return;
> 
>+    auto& events = eventNames();
>+
>     if (m_mediaElement && m_isListening) {
>         for (auto& eventName : observedEventNames())
>             m_mediaElement->removeEventListener(eventName, *this, false);
>-        m_mediaElement->audioTracks().removeEventListener(eventNames().changeEvent, *this, false);
>-        m_mediaElement->textTracks().removeEventListener(eventNames().changeEvent, *this, false);
>+        auto& audioTracks = m_mediaElement->audioTracks();
>+        audioTracks.removeEventListener(events.addtrackEvent, *this, false);
>+        audioTracks.removeEventListener(events.changeEvent, *this, false);
>+        audioTracks.removeEventListener(events.removetrackEvent, *this, false);
>+
>+        auto& textTracks = m_mediaElement->audioTracks();
>+        textTracks.removeEventListener(events.addtrackEvent, *this, false);
>+        textTracks.removeEventListener(events.changeEvent, *this, false);
>+        textTracks.removeEventListener(events.removetrackEvent, *this, false);
>     }
>     m_isListening = false;
> 
>@@ -77,9 +86,16 @@ void PlaybackSessionModelMediaElement::setMediaElement(HTMLMediaElement* mediaEl
>     if (m_mediaElement) {
>         for (auto& eventName : observedEventNames())
>             m_mediaElement->addEventListener(eventName, *this, false);
>-        m_mediaElement->audioTracks().addEventListener(eventNames().changeEvent, *this, false);
>-        m_mediaElement->textTracks().addEventListener(eventNames().changeEvent, *this, false);
>-        m_isListening = true;
>+
>+        auto& audioTracks = m_mediaElement->audioTracks();
>+        audioTracks.addEventListener(events.addtrackEvent, *this, false);
>+        audioTracks.addEventListener(events.changeEvent, *this, false);
>+        audioTracks.addEventListener(events.removetrackEvent, *this, false);
>+
>+        auto& textTracks = m_mediaElement->audioTracks();
>+        textTracks.addEventListener(events.addtrackEvent, *this, false);
>+        textTracks.addEventListener(events.changeEvent, *this, false);
>+        textTracks.addEventListener(events.removetrackEvent, *this, false);
>     }
> 
>     updateForEventName(eventNameAll());
>@@ -368,8 +384,6 @@ const Vector<AtomicString>& PlaybackSessionModelMediaElement::observedEventNames
>         eventNames().ratechangeEvent,
>         eventNames().timeupdateEvent,
>         eventNames().progressEvent,
>-        eventNames().addtrackEvent,
>-        eventNames().removetrackEvent,
>         eventNames().volumechangeEvent,
>         eventNames().webkitcurrentplaybacktargetiswirelesschangedEvent,
>     });

Actions: View | Formatted Diff | Diff

Attachments on bug 185268: 339468