Changeset 280326 in webkit

Timestamp:

Jul 26, 2021, 5:02:30 PM (4 years ago)

Author:

jer.noble@apple.com

Message:

REGRESSION: [iOS] ASSERTION FAILED: !m_useCount in WebKit::SandboxExtension::~SandboxExtension()
​https://bugs.webkit.org/show_bug.cgi?id=228171
<rdar://problem/80926509>

Reviewed by Eric Carlson.

SandboxExtension expects to be revoked before it is destroyed, something that is done by
RemoteMediaPlayerProxy::invalidate(). However, invalidate() won't be called if the
RemoteMediaPlayerManagerProxy is destroyed before all its proxies are invalidated.

Ensure every RemoteMediaPlayerProxy contained by the RemoteMediaPlayerManagerProxy is
invalidated in RemoteMediaPlayerManagerProxy's destructor.

• GPUProcess/media/RemoteMediaPlayerManagerProxy.cpp:

(WebKit::RemoteMediaPlayerManagerProxy::~RemoteMediaPlayerManagerProxy):

• GPUProcess/media/RemoteMediaPlayerManagerProxy.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• GPUProcess/media/RemoteMediaPlayerManagerProxy.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-07-26  Jer Noble  <jer.noble@apple.com>
+
+        REGRESSION: [iOS] ASSERTION FAILED: !m_useCount in WebKit::SandboxExtension::~SandboxExtension()
+        https://bugs.webkit.org/show_bug.cgi?id=228171
+        <rdar://problem/80926509>
+
+        Reviewed by Eric Carlson.
+
+        SandboxExtension expects to be revoked before it is destroyed, something that is done by
+        RemoteMediaPlayerProxy::invalidate(). However, invalidate() won't be called if the 
+        RemoteMediaPlayerManagerProxy is destroyed before all its proxies are invalidated.
+
+        Ensure every RemoteMediaPlayerProxy contained by the RemoteMediaPlayerManagerProxy is
+        invalidated in RemoteMediaPlayerManagerProxy's destructor.
+
+        * GPUProcess/media/RemoteMediaPlayerManagerProxy.cpp:
+        (WebKit::RemoteMediaPlayerManagerProxy::~RemoteMediaPlayerManagerProxy):
+        * GPUProcess/media/RemoteMediaPlayerManagerProxy.h:
+
 2021-07-26  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.cpp

@@ -56 +56 @@
 RemoteMediaPlayerManagerProxy::~RemoteMediaPlayerManagerProxy()
 {
+    auto proxies = std::exchange(m_proxies, { });
+
+    for (auto& proxy : proxies.values())
+        proxy->invalidate();
 }