Title: [218466] trunk/Source/WebKit2
- Revision
- 218466
- Author
- [email protected]
- Date
- 2017-06-18 18:59:17 -0700 (Sun, 18 Jun 2017)
Log Message
Drop unused UserMediaPermissionRequestManager::cancelPendingRequests()
https://bugs.webkit.org/show_bug.cgi?id=173529
<rdar://problem/32836986>
Reviewed by Sam Weinig.
Drop UserMediaPermissionRequestManager::cancelPendingRequests() as it is unused
and its implementation is wrong (modifies the hash maps it is iterating on).
* WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:
(WebKit::UserMediaPermissionRequestManager::cancelPendingRequests): Deleted.
* WebProcess/MediaStream/UserMediaPermissionRequestManager.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (218465 => 218466)
--- trunk/Source/WebKit2/ChangeLog 2017-06-18 20:25:19 UTC (rev 218465)
+++ trunk/Source/WebKit2/ChangeLog 2017-06-19 01:59:17 UTC (rev 218466)
@@ -1,3 +1,18 @@
+2017-06-18 Chris Dumez <[email protected]>
+
+ Drop unused UserMediaPermissionRequestManager::cancelPendingRequests()
+ https://bugs.webkit.org/show_bug.cgi?id=173529
+ <rdar://problem/32836986>
+
+ Reviewed by Sam Weinig.
+
+ Drop UserMediaPermissionRequestManager::cancelPendingRequests() as it is unused
+ and its implementation is wrong (modifies the hash maps it is iterating on).
+
+ * WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:
+ (WebKit::UserMediaPermissionRequestManager::cancelPendingRequests): Deleted.
+ * WebProcess/MediaStream/UserMediaPermissionRequestManager.h:
+
2017-06-17 Chris Dumez <[email protected]>
Unreviewed, follow-up build fix after r218457.
Modified: trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp (218465 => 218466)
--- trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp 2017-06-18 20:25:19 UTC (rev 218465)
+++ trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp 2017-06-19 01:59:17 UTC (rev 218466)
@@ -57,15 +57,6 @@
sandboxExtension.value->revoke();
}
-void UserMediaPermissionRequestManager::cancelPendingRequests()
-{
- for (auto& request : m_idToUserMediaRequestMap.values())
- cancelUserMediaRequest(*request);
-
- for (auto& request : m_idToMediaDevicesEnumerationRequestMap.values())
- cancelMediaDevicesEnumeration(*request);
-}
-
void UserMediaPermissionRequestManager::startUserMediaRequest(UserMediaRequest& request)
{
Document* document = request.document();
Modified: trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.h (218465 => 218466)
--- trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.h 2017-06-18 20:25:19 UTC (rev 218465)
+++ trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.h 2017-06-19 01:59:17 UTC (rev 218466)
@@ -55,8 +55,6 @@
void grantUserMediaDeviceSandboxExtensions(const MediaDeviceSandboxExtensions&);
void revokeUserMediaDeviceSandboxExtensions(const Vector<String>&);
- void cancelPendingRequests();
-
private:
void sendUserMediaRequest(WebCore::UserMediaRequest&);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
