Title: [272959] branches/safari-611-branch/Source/WebCore
- Revision
- 272959
- Author
- repst...@apple.com
- Date
- 2021-02-16 17:19:09 -0800 (Tue, 16 Feb 2021)
Log Message
Cherry-pick r272633. rdar://problem/74410421
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:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@272633 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-611-branch/Source/WebCore/ChangeLog (272958 => 272959)
--- branches/safari-611-branch/Source/WebCore/ChangeLog 2021-02-17 01:18:57 UTC (rev 272958)
+++ branches/safari-611-branch/Source/WebCore/ChangeLog 2021-02-17 01:19:09 UTC (rev 272959)
@@ -1,5 +1,46 @@
2021-02-16 Ruben Turcios <rubent...@apple.com>
+ Cherry-pick r272633. rdar://problem/74410421
+
+ 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:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@272633 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-02-09 Eric Carlson <eric.carl...@apple.com>
+
+ 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-16 Ruben Turcios <rubent...@apple.com>
+
Cherry-pick r272622. rdar://problem/74410599
Reduce the overhead of HTMLDocumentParser in innerHTML setter
Modified: branches/safari-611-branch/Source/WebCore/html/MediaElementSession.cpp (272958 => 272959)
--- branches/safari-611-branch/Source/WebCore/html/MediaElementSession.cpp 2021-02-17 01:18:57 UTC (rev 272958)
+++ branches/safari-611-branch/Source/WebCore/html/MediaElementSession.cpp 2021-02-17 01:19:09 UTC (rev 272959)
@@ -122,7 +122,6 @@
, m_logIdentifier(element.logIdentifier())
#endif
{
- addedMediaUsageManagerSessionIfNecessary();
}
MediaElementSession::~MediaElementSession()
@@ -134,7 +133,7 @@
#endif
}
-void MediaElementSession::addedMediaUsageManagerSessionIfNecessary()
+void MediaElementSession::addMediaUsageManagerSessionIfNecessary()
{
#if ENABLE(MEDIA_USAGE)
if (m_haveAddedMediaUsageManagerSession)
@@ -215,7 +214,6 @@
{
m_elementIsHiddenBecauseItWasRemovedFromDOM = !m_element.inActiveDocument();
scheduleClientDataBufferingCheck();
- addedMediaUsageManagerSessionIfNecessary();
}
void MediaElementSession::scheduleClientDataBufferingCheck()
@@ -1092,7 +1090,7 @@
m_mediaUsageInfo = WTFMove(usage);
#if ENABLE(MEDIA_USAGE)
- ASSERT(m_haveAddedMediaUsageManagerSession);
+ addMediaUsageManagerSessionIfNecessary();
page->chrome().client().updateMediaUsageManagerSessionState(mediaSessionIdentifier(), *m_mediaUsageInfo);
#endif
}
Modified: branches/safari-611-branch/Source/WebCore/html/MediaElementSession.h (272958 => 272959)
--- branches/safari-611-branch/Source/WebCore/html/MediaElementSession.h 2021-02-17 01:18:57 UTC (rev 272958)
+++ branches/safari-611-branch/Source/WebCore/html/MediaElementSession.h 2021-02-17 01:19:09 UTC (rev 272959)
@@ -195,7 +195,7 @@
void clientDataBufferingTimerFired();
void updateClientDataBuffering();
- void addedMediaUsageManagerSessionIfNecessary();
+ void addMediaUsageManagerSessionIfNecessary();
HTMLMediaElement& m_element;
BehaviorRestrictions m_restrictions;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
