Changeset 273789 in webkit

Timestamp:

Mar 2, 2021, 7:08:27 PM (6 years ago)

Author:

Alan Coon

Message:

Cherry-pick r273289. rdar://problem/74953476

UserMediaPermissionRequestManagerProxy may be released while computing capture device list
​https://bugs.webkit.org/show_bug.cgi?id=222236
<rdar://74480265>

Unreviewed, address post-review comment.

• UIProcess/UserMediaPermissionRequestManagerProxy.cpp: (WebKit::UserMediaPermissionRequestManagerProxy::computeFilteredDeviceList): Use captured this.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@273289 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-612.1.5-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/UserMediaPermissionRequestManagerProxy.cpp (modified) (1 diff)

branches/safari-612.1.5-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2021-03-02  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r273289. rdar://problem/74953476
+
+    UserMediaPermissionRequestManagerProxy may be released while computing capture device list
+    https://bugs.webkit.org/show_bug.cgi?id=222236
+    <rdar://74480265>
+    
+    Unreviewed, address post-review comment.
+    
+    
+    * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+    (WebKit::UserMediaPermissionRequestManagerProxy::computeFilteredDeviceList): Use
+    captured `this`.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273289 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-02-22  Eric Carlson  <eric.carlson@apple.com>
+
+            UserMediaPermissionRequestManagerProxy may be released while computing capture device list
+            https://bugs.webkit.org/show_bug.cgi?id=222236
+            <rdar://74480265>
+
+            Unreviewed, address post-review comment.
+
+            * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+            (WebKit::UserMediaPermissionRequestManagerProxy::computeFilteredDeviceList): Use
+            captured `this`.
+
 2021-03-02  Alan Coon  <alancoon@apple.com>
 

branches/safari-612.1.5-branch/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp

@@ -741 +741 @@
         }
 
-        weakThis->m_hasFilteredDeviceList = !revealIdsAndLabels;
+        m_hasFilteredDeviceList = !revealIdsAndLabels;
         ALWAYS_LOG(LOGIDENTIFIER, filteredDevices.size(), " devices revealed");