Title: [278495] branches/safari-611-branch/Source/WebCore
- Revision
- 278495
- Author
- [email protected]
- Date
- 2021-06-04 13:24:37 -0700 (Fri, 04 Jun 2021)
Log Message
Cherry-pick r278000. rdar://problem/78875213
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):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278000 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-611-branch/Source/WebCore/ChangeLog (278494 => 278495)
--- branches/safari-611-branch/Source/WebCore/ChangeLog 2021-06-04 20:24:34 UTC (rev 278494)
+++ branches/safari-611-branch/Source/WebCore/ChangeLog 2021-06-04 20:24:37 UTC (rev 278495)
@@ -1,5 +1,38 @@
2021-06-04 Alan Coon <[email protected]>
+ Cherry-pick r278000. rdar://problem/78875213
+
+ 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):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278000 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 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-06-04 Alan Coon <[email protected]>
+
Cherry-pick r277951. rdar://problem/78875422
REGRESSION(r256715): XSLTProcessor does not parse script when transforming to document
Modified: branches/safari-611-branch/Source/WebCore/html/HTMLMediaElement.cpp (278494 => 278495)
--- branches/safari-611-branch/Source/WebCore/html/HTMLMediaElement.cpp 2021-06-04 20:24:34 UTC (rev 278494)
+++ branches/safari-611-branch/Source/WebCore/html/HTMLMediaElement.cpp 2021-06-04 20:24:37 UTC (rev 278495)
@@ -5827,7 +5827,7 @@
void HTMLMediaElement::enqueuePlaybackTargetAvailabilityChangedEvent()
{
- bool hasTargets = m_mediaSession->hasWirelessPlaybackTargets();
+ bool hasTargets = m_mediaSession && m_mediaSession->hasWirelessPlaybackTargets();
ALWAYS_LOG(LOGIDENTIFIER, "hasTargets = ", hasTargets);
auto event = WebKitPlaybackTargetAvailabilityEvent::create(eventNames().webkitplaybacktargetavailabilitychangedEvent, hasTargets);
event->setTarget(this);
@@ -7642,7 +7642,7 @@
state |= RequiresPlaybackTargetMonitoring;
}
- bool requireUserGesture = m_mediaSession->hasBehaviorRestriction(MediaElementSession::RequireUserGestureToAutoplayToExternalDevice);
+ bool requireUserGesture = m_mediaSession && m_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
