Title: [272633] trunk/Source/WebCore
- Revision
- 272633
- Author
- [email protected]
- Date
- 2021-02-09 19:30:57 -0800 (Tue, 09 Feb 2021)
Log Message
REGRESSION: (r272458): [BigSur Debug] ASSERTION FAILED: m_haveAddedMediaUsageManagerSession in WebCore::MediaElementSession::updateMediaUsageIfChanged()
https://bugs.webkit.org/show_bug.cgi?id=221634
<rdar://problem/74161017>
Reviewed by Ryosuke Niwa.
No new tests, this fixes an assertion in an existing test.
* html/MediaElementSession.cpp:
(WebCore::MediaElementSession::MediaElementSession):
(WebCore::MediaElementSession::addMediaUsageManagerSessionIfNecessary):
(WebCore::MediaElementSession::inActiveDocumentChanged):
(WebCore::MediaElementSession::updateMediaUsageIfChanged):
(WebCore::MediaElementSession::addedMediaUsageManagerSessionIfNecessary): Deleted.
* html/MediaElementSession.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (272632 => 272633)
--- trunk/Source/WebCore/ChangeLog 2021-02-10 03:24:59 UTC (rev 272632)
+++ trunk/Source/WebCore/ChangeLog 2021-02-10 03:30:57 UTC (rev 272633)
@@ -1,3 +1,21 @@
+2021-02-09 Eric Carlson <[email protected]>
+
+ REGRESSION: (r272458): [BigSur Debug] ASSERTION FAILED: m_haveAddedMediaUsageManagerSession in WebCore::MediaElementSession::updateMediaUsageIfChanged()
+ https://bugs.webkit.org/show_bug.cgi?id=221634
+ <rdar://problem/74161017>
+
+ Reviewed by Ryosuke Niwa.
+
+ No new tests, this fixes an assertion in an existing test.
+
+ * html/MediaElementSession.cpp:
+ (WebCore::MediaElementSession::MediaElementSession):
+ (WebCore::MediaElementSession::addMediaUsageManagerSessionIfNecessary):
+ (WebCore::MediaElementSession::inActiveDocumentChanged):
+ (WebCore::MediaElementSession::updateMediaUsageIfChanged):
+ (WebCore::MediaElementSession::addedMediaUsageManagerSessionIfNecessary): Deleted.
+ * html/MediaElementSession.h:
+
2021-02-09 Don Olmstead <[email protected]>
[GTK] Export additional methods of SourceBufferPrivate to support hidden visibility
Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (272632 => 272633)
--- trunk/Source/WebCore/html/MediaElementSession.cpp 2021-02-10 03:24:59 UTC (rev 272632)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2021-02-10 03:30:57 UTC (rev 272633)
@@ -128,7 +128,6 @@
, m_logIdentifier(element.logIdentifier())
#endif
{
- addedMediaUsageManagerSessionIfNecessary();
}
MediaElementSession::~MediaElementSession()
@@ -140,7 +139,7 @@
#endif
}
-void MediaElementSession::addedMediaUsageManagerSessionIfNecessary()
+void MediaElementSession::addMediaUsageManagerSessionIfNecessary()
{
#if ENABLE(MEDIA_USAGE)
if (m_haveAddedMediaUsageManagerSession)
@@ -221,7 +220,6 @@
{
m_elementIsHiddenBecauseItWasRemovedFromDOM = !m_element.inActiveDocument();
scheduleClientDataBufferingCheck();
- addedMediaUsageManagerSessionIfNecessary();
}
void MediaElementSession::scheduleClientDataBufferingCheck()
@@ -1169,7 +1167,7 @@
m_mediaUsageInfo = WTFMove(usage);
#if ENABLE(MEDIA_USAGE)
- ASSERT(m_haveAddedMediaUsageManagerSession);
+ addMediaUsageManagerSessionIfNecessary();
page->chrome().client().updateMediaUsageManagerSessionState(mediaSessionIdentifier(), *m_mediaUsageInfo);
#endif
}
Modified: trunk/Source/WebCore/html/MediaElementSession.h (272632 => 272633)
--- trunk/Source/WebCore/html/MediaElementSession.h 2021-02-10 03:24:59 UTC (rev 272632)
+++ trunk/Source/WebCore/html/MediaElementSession.h 2021-02-10 03:30:57 UTC (rev 272633)
@@ -199,7 +199,7 @@
void clientDataBufferingTimerFired();
void updateClientDataBuffering();
- void addedMediaUsageManagerSessionIfNecessary();
+ void addMediaUsageManagerSessionIfNecessary();
HTMLMediaElement& m_element;
BehaviorRestrictions m_restrictions;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
