Changeset 196310 in webkit

Timestamp:

Feb 9, 2016 9:13:27 AM (8 years ago)

Author:

eric.carlson@apple.com

Message:

checkValidity() sometimes asserts in WebUserMediaClient::pageDestroyed
​https://bugs.webkit.org/show_bug.cgi?id=154029
<rdar://problem/24065022>

Reviewed by Alex Christensen.

• WebCoreSupport/WebUserMediaClient.mm:

(WebUserMediaClient::pageDestroyed): Copy map keys to a vector and clear the map before

enumerating the vector and canceling the requests. ASSERT that the map is not modified
during cleanup. Clean up the permission check map.

(WebUserMediaClient::requestUserMediaAccess): Add the request to the map before calling the

UI delegate in case it works synchronously (as it does in DRT).

(WebUserMediaClient::checkUserMediaPermission): Ditto.
(WebUserMediaClient::cancelUserMediaPermissionCheck): White-space cleanup.
(-[WebUserMediaPolicyListener allow]): Ditto.

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/WebUserMediaClient.mm (modified) (7 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2016-02-09  Eric Carlson  <eric.carlson@apple.com>
+
+        checkValidity() sometimes asserts in WebUserMediaClient::pageDestroyed
+        https://bugs.webkit.org/show_bug.cgi?id=154029
+        <rdar://problem/24065022>
+
+        Reviewed by Alex Christensen.
+
+        * WebCoreSupport/WebUserMediaClient.mm:
+        (WebUserMediaClient::pageDestroyed): Copy map keys to a vector and clear the map before
+          enumerating the vector and canceling the requests. ASSERT that the map is not modified
+          during cleanup. Clean up the permission check map.
+        (WebUserMediaClient::requestUserMediaAccess): Add the request to the map before calling the
+          UI delegate in case it works synchronously (as it does in DRT).
+        (WebUserMediaClient::checkUserMediaPermission): Ditto.
+        (WebUserMediaClient::cancelUserMediaPermissionCheck): White-space cleanup.
+        (-[WebUserMediaPolicyListener allow]): Ditto.
+
 2016-02-08  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -97 +97 @@
 }
 
-
 WebUserMediaClient::WebUserMediaClient(WebView* webView)
     : m_webView(webView)
@@ -109 +108 @@
 void WebUserMediaClient::pageDestroyed()
 {
-    UserMediaRequestsMap& requestsMap = userMediaRequestsMap();
-    for (UserMediaRequestsMap::iterator it = requestsMap.begin(); it != requestsMap.end(); ++it) {
-        [it->value cancelUserMediaAccessRequest];
-        requestsMap.remove(it);
-    }
+    auto& requestsMap = userMediaRequestsMap();
+    Vector<RetainPtr<WebUserMediaPolicyListener>> pendingRequests;
+    copyValuesToVector(requestsMap, pendingRequests);
+    requestsMap.clear();
+
+    for (auto& request : pendingRequests)
+        [request cancelUserMediaAccessRequest];
+
+    ASSERT(userMediaRequestsMap().isEmpty());
+
+    auto& checkMap = userMediaCheckMap();
+    Vector<RetainPtr<WebUserMediaPolicyCheckerListener>> pendingChecks;
+    copyValuesToVector(checkMap, pendingChecks);
+    checkMap.clear();
+
+    for (auto& check : pendingChecks)
+        [check cancelUserMediaPermissionCheck];
+
+    ASSERT(userMediaCheckMap().isEmpty());
 
     delete this;
@@ -131 +144 @@
     WebSecurityOrigin *webOrigin = [[WebSecurityOrigin alloc] _initWithWebCoreSecurityOrigin:request.securityOrigin()];
 
+    AddRequestToRequestMap(&request, listener);
     CallUIDelegate(m_webView, selector, webOrigin, listener);
-    AddRequestToRequestMap(&request, listener);
 
     [webOrigin release];
@@ -164 +177 @@
     WebSecurityOrigin *webOrigin = [[WebSecurityOrigin alloc] _initWithWebCoreSecurityOrigin:request.securityOrigin()];
 
+    AddPermissionCheckToMap(&request, listener);
     CallUIDelegate(m_webView, selector, webOrigin, listener);
-    AddPermissionCheckToMap(&request, listener);
 
     [webOrigin release];
@@ -172 +185 @@
     END_BLOCK_OBJC_EXCEPTIONS;
 }
-
 
 void WebUserMediaClient::cancelUserMediaPermissionCheck(WebCore::UserMediaPermissionCheck& request)
@@ -216 +228 @@
     
     _request->userMediaAccessGranted(_request->allowedAudioDeviceUID(), _request->allowedVideoDeviceUID());
-
     RemoveRequestFromRequestMap(_request.get());
 #endif