Title: [263991] trunk/Source/WebKit
- Revision
- 263991
- Author
- peng.l...@apple.com
- Date
- 2020-07-06 15:25:04 -0700 (Mon, 06 Jul 2020)
Log Message
REGRESSION (r261001): ASSERTION FAILED: m_clientCounts.contains(contextId) in WebKit::VideoFullscreenManagerProxy::removeClientForContext
https://bugs.webkit.org/show_bug.cgi?id=212986
Reviewed by Jer Noble.
* UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:
(WebKit::VideoFullscreenManagerProxy::removeClientForContext):
Function removeClientForContext() could be called multiple times with the same contextId.
We should bail out if m_clientCounts does not contain the contextId.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (263990 => 263991)
--- trunk/Source/WebKit/ChangeLog 2020-07-06 22:04:40 UTC (rev 263990)
+++ trunk/Source/WebKit/ChangeLog 2020-07-06 22:25:04 UTC (rev 263991)
@@ -1,3 +1,15 @@
+2020-07-06 Peng Liu <peng.l...@apple.com>
+
+ REGRESSION (r261001): ASSERTION FAILED: m_clientCounts.contains(contextId) in WebKit::VideoFullscreenManagerProxy::removeClientForContext
+ https://bugs.webkit.org/show_bug.cgi?id=212986
+
+ Reviewed by Jer Noble.
+
+ * UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:
+ (WebKit::VideoFullscreenManagerProxy::removeClientForContext):
+ Function removeClientForContext() could be called multiple times with the same contextId.
+ We should bail out if m_clientCounts does not contain the contextId.
+
2020-07-06 Kate Cheney <katherine_che...@apple.com>
update-webkit-localizable-strings exits without writing localized strings because of an R"" string
Modified: trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm (263990 => 263991)
--- trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm 2020-07-06 22:04:40 UTC (rev 263990)
+++ trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm 2020-07-06 22:25:04 UTC (rev 263991)
@@ -458,7 +458,8 @@
void VideoFullscreenManagerProxy::removeClientForContext(PlaybackSessionContextIdentifier contextId)
{
- ASSERT(m_clientCounts.contains(contextId));
+ if (!m_clientCounts.contains(contextId))
+ return;
int clientCount = m_clientCounts.get(contextId);
ASSERT(clientCount > 0);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
