Title: [282529] releases/WebKitGTK/webkit-2.32/Source/WebCore
Revision
282529
Author
[email protected]
Date
2021-09-16 03:09:36 -0700 (Thu, 16 Sep 2021)

Log Message

Merge r278000 - Only create MediaElementSession when necessary
https://bugs.webkit.org/show_bug.cgi?id=226132

Patch by Ian Gilbert <[email protected]> on 2021-05-25
Reviewed by Eric Carlson.

Some methods had an unexpected side effect of creating a MediaElementSession.
Modified these to not create one if one does not already exist.

* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::enqueuePlaybackTargetAvailabilityChangedEvent):
(WebCore::HTMLMediaElement::mediaState const):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog (282528 => 282529)


--- releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog	2021-09-16 10:09:30 UTC (rev 282528)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog	2021-09-16 10:09:36 UTC (rev 282529)
@@ -1,3 +1,17 @@
+2021-05-25  Ian Gilbert  <[email protected]>
+
+        Only create MediaElementSession when necessary
+        https://bugs.webkit.org/show_bug.cgi?id=226132
+
+        Reviewed by Eric Carlson.
+
+        Some methods had an unexpected side effect of creating a MediaElementSession.
+        Modified these to not create one if one does not already exist.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::enqueuePlaybackTargetAvailabilityChangedEvent):
+        (WebCore::HTMLMediaElement::mediaState const):
+
 2021-05-22  Rob Buis  <[email protected]>
 
         Detect invalid InlinePathData in StrokeInlinePath

Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/html/HTMLMediaElement.cpp (282528 => 282529)


--- releases/WebKitGTK/webkit-2.32/Source/WebCore/html/HTMLMediaElement.cpp	2021-09-16 10:09:30 UTC (rev 282528)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/html/HTMLMediaElement.cpp	2021-09-16 10:09:36 UTC (rev 282529)
@@ -5854,7 +5854,7 @@
 
 void HTMLMediaElement::enqueuePlaybackTargetAvailabilityChangedEvent()
 {
-    bool hasTargets = m_mediaSession->hasWirelessPlaybackTargets();
+    bool hasTargets = m_mediaSession && mediaSession().hasWirelessPlaybackTargets();
     ALWAYS_LOG(LOGIDENTIFIER, "hasTargets = ", hasTargets);
     auto event = WebKitPlaybackTargetAvailabilityEvent::create(eventNames().webkitplaybacktargetavailabilitychangedEvent, hasTargets);
     event->setTarget(this);
@@ -7667,7 +7667,7 @@
             state |= RequiresPlaybackTargetMonitoring;
     }
 
-    bool requireUserGesture = m_mediaSession->hasBehaviorRestriction(MediaElementSession::RequireUserGestureToAutoplayToExternalDevice);
+    bool requireUserGesture = m_mediaSession && mediaSession().hasBehaviorRestriction(MediaElementSession::RequireUserGestureToAutoplayToExternalDevice);
     if (m_readyState >= HAVE_METADATA && !requireUserGesture && !m_failedToPlayToWirelessTarget)
         state |= ExternalDeviceAutoPlayCandidate;
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to