Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: cherry-pick 246c10dede97 from chromium (#33246)
* chore: cherry-pick 246c10dede97 from chromium * chore: update patches Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Electron Bot <electron@github.com>
- Loading branch information
1 parent
c465f02
commit 7d4325e
Showing
2 changed files
with
37 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Tony Herre <toprice@chromium.org> | ||
Date: Fri, 18 Feb 2022 13:52:01 +0000 | ||
Subject: Switch to new RequestPermissionsFromCurrentDocument API method for | ||
Media Stream Devices | ||
|
||
Switch away from the deprecated RequestPermissions() API, as a part of removing a bug where the previously provided request.security_origin param might get destroyed during the method execution. | ||
|
||
(cherry picked from commit cb6778fb965e2b010922f157c68480de863c252e) | ||
|
||
Bug: 1283402 | ||
Change-Id: I512ce910146ec60d4d35fa1a86a71a3b0983a5d1 | ||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3417436 | ||
Reviewed-by: Florent Castelli <orphis@chromium.org> | ||
Commit-Queue: Tony Herre <toprice@chromium.org> | ||
Cr-Original-Commit-Position: refs/heads/main@{#964535} | ||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3473365 | ||
Cr-Commit-Position: refs/branch-heads/4844@{#655} | ||
Cr-Branched-From: 007241ce2e6c8e5a7b306cc36c730cd07cd38825-refs/heads/main@{#961656} | ||
|
||
diff --git a/components/webrtc/media_stream_devices_controller.cc b/components/webrtc/media_stream_devices_controller.cc | ||
index 8eb0e01815f6a5f2f0241554b3e5b93017564242..33468f9f2b1bcc2cda8d98748902984ae82e147d 100644 | ||
--- a/components/webrtc/media_stream_devices_controller.cc | ||
+++ b/components/webrtc/media_stream_devices_controller.cc | ||
@@ -139,9 +139,8 @@ void MediaStreamDevicesController::RequestPermissions( | ||
} | ||
} | ||
|
||
- permission_manager->RequestPermissions( | ||
- content_settings_types, rfh, request.security_origin, | ||
- request.user_gesture, | ||
+ permission_manager->RequestPermissionsFromCurrentDocument( | ||
+ content_settings_types, rfh, request.user_gesture, | ||
base::BindOnce( | ||
&MediaStreamDevicesController::RequestAndroidPermissionsIfNeeded, | ||
web_contents, std::move(controller), will_prompt_for_audio, |