Changeset 242848 in webkit

Timestamp:

Mar 13, 2019, 1:24:09 AM (7 years ago)

Author:

bshafiei@apple.com

Message:

Cherry-pick r241002. rdar://problem/48839377

UserMediaPermissionRequestManagerProxy lambdas should check for 'this' being valid
​https://bugs.webkit.org/show_bug.cgi?id=194246

Reviewed by Eric Carlson.

With PSON enabled, the manager proxy can be destroyed.
It is thus important for its callbacks to check for 'this' to be valid.

• UIProcess/UserMediaPermissionRequestManagerProxy.cpp: (WebKit::UserMediaPermissionRequestManagerProxy::captureDevicesChanged): (WebKit::UserMediaPermissionRequestManagerProxy::requestUserMediaPermissionForFrame): (WebKit::UserMediaPermissionRequestManagerProxy::enumerateMediaDevicesForFrame):

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

Location:

branches/safari-607-branch/Source/WebKit

Files:

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

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

@@ +1 @@
+2019-03-13  Babak Shafiei  <bshafiei@apple.com>
+
+        Cherry-pick r241002. rdar://problem/48839377
+
+    UserMediaPermissionRequestManagerProxy lambdas should check for 'this' being valid
+    https://bugs.webkit.org/show_bug.cgi?id=194246
+    
+    Reviewed by Eric Carlson.
+    
+    With PSON enabled, the manager proxy can be destroyed.
+    It is thus important for its callbacks to check for 'this' to be valid.
+    
+    * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+    (WebKit::UserMediaPermissionRequestManagerProxy::captureDevicesChanged):
+    (WebKit::UserMediaPermissionRequestManagerProxy::requestUserMediaPermissionForFrame):
+    (WebKit::UserMediaPermissionRequestManagerProxy::enumerateMediaDevicesForFrame):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@241002 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-02-05  Youenn Fablet  <youenn@apple.com>
+
+            UserMediaPermissionRequestManagerProxy lambdas should check for 'this' being valid
+            https://bugs.webkit.org/show_bug.cgi?id=194246
+
+            Reviewed by Eric Carlson.
+
+            With PSON enabled, the manager proxy can be destroyed.
+            It is thus important for its callbacks to check for 'this' to be valid.
+
+            * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+            (WebKit::UserMediaPermissionRequestManagerProxy::captureDevicesChanged):
+            (WebKit::UserMediaPermissionRequestManagerProxy::requestUserMediaPermissionForFrame):
+            (WebKit::UserMediaPermissionRequestManagerProxy::enumerateMediaDevicesForFrame):
+
 2019-03-12  Kocsen Chung  <kocsen_chung@apple.com>
 

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

@@ -94 +94 @@
 
     auto requestID = generateRequestID();
-    auto handler = [this, requestID](bool originHasPersistentAccess) mutable {
+    auto handler = [this, weakThis = makeWeakPtr(*this), requestID](bool originHasPersistentAccess) mutable {
+        if (!weakThis)
+            return;
 
         auto pendingRequest = m_pendingDeviceRequests.take(requestID);
@@ -384 +386 @@
 
     auto requestID = generateRequestID();
-    auto havePermissionInfoHandler = [this, requestID, validHandler = WTFMove(validHandler), invalidHandler = WTFMove(invalidHandler), localUserRequest = userRequest](bool originHasPersistentAccess) mutable {
+    auto havePermissionInfoHandler = [this, weakThis = makeWeakPtr(*this), requestID, validHandler = WTFMove(validHandler), invalidHandler = WTFMove(invalidHandler), localUserRequest = userRequest](bool originHasPersistentAccess) mutable {
+        if (!weakThis)
+            return;
 
         auto pendingRequest = m_pendingDeviceRequests.take(requestID);
@@ -456 +460 @@
 
     auto requestID = generateRequestID();
-    auto completionHandler = [this, requestID, userMediaID, requestOrigin = userMediaDocumentOrigin.copyRef(), topOrigin = topLevelDocumentOrigin.copyRef()](bool originHasPersistentAccess) {
+    auto completionHandler = [this, weakThis = makeWeakPtr(*this), requestID, userMediaID, requestOrigin = userMediaDocumentOrigin.copyRef(), topOrigin = topLevelDocumentOrigin.copyRef()](bool originHasPersistentAccess) mutable {
+        if (!weakThis)
+            return;
 
         if (!m_page.isValid())
             return;
 
-        m_page.websiteDataStore().deviceIdHashSaltStorage().deviceIdHashSaltForOrigin(requestOrigin.get(), topOrigin.get(), [this, weakThis = makeWeakPtr(*this), requestID, userMediaID, &originHasPersistentAccess] (String&& deviceIDHashSalt) {
+        m_page.websiteDataStore().deviceIdHashSaltStorage().deviceIdHashSaltForOrigin(requestOrigin.get(), topOrigin.get(), [this, weakThis = WTFMove(weakThis), requestID, userMediaID, &originHasPersistentAccess] (String&& deviceIDHashSalt) {
             if (!weakThis)
                 return;