chore: bump chromium to 122.0.6261.6 (main) (#40949)
* chore: bump chromium in DEPS to 122.0.6239.2 * chore: update patches * refactor: extensions replaced StringPiece with string_view Ref:5171926
* chore: bump chromium in DEPS to 122.0.6240.0 * chore: update patches * chore: bump chromium in DEPS to 122.0.6241.5 * chore: bump chromium in DEPS to 122.0.6245.0 * chore: bump chromium in DEPS to 122.0.6247.0 * chore: bump chromium in DEPS to 122.0.6249.0 * chore: bump chromium in DEPS to 122.0.6251.0 * 5192010: Rename {absl => std}::optional in //chrome/5192010
* 5109767: CodeHealth: Fix leaked raw_ptr in Linux ProcessSingleton5109767
* 5105227: [media_preview] Show requested device in permission bubble5105227
* chore: bump chromium in DEPS to 122.0.6253.0 * chore: update patches * 5180720: Polish tiled browser window UI on Linux |5180720
* chore: update patches * chore: bump chromium in DEPS to 122.0.6255.0 * chore: update patches * 5186276: [autopip] Make "allow once" per navigation |5186276
* chore: bump chromium in DEPS to 122.0.6257.0 * chore: bump chromium in DEPS to 122.0.6259.0 * chore: update patches * 5190661: Automated T* -> raw_ptr<T> rewrite "refresh" |5190661
* 5206106: Make sure RenderFrameHosts are active when printing |5206106
* 5202674: Reland "Automated T* -> raw_ptr<T> rewrite 'refresh'"5202674
* fixup CodeHealth: Fix leaked raw_ptr in Linux ProcessSingleton5109767
* fixup 5206106: Make sure RenderFrameHosts are active when printing * Make legacy ToV8() helpers private to ScriptPromiseResolver, their only user5207474
* fixup CodeHealth: Fix leaked raw_ptr in Linux ProcessSingleton * fixup 5186276: [autopip] Make "allow once" per navigation5186276
* chore: update patches after rebase * chore: bump chromium in DEPS to 122.0.6260.0 * 5191363: Mark LOG(FATAL) [[noreturn]]5191363
* fixup 5186276: [autopip] Make "allow once" per navigation5186276
* fixup Make legacy ToV8() helpers private to ScriptPromiseResolver5207474
* chore: update patches * chore: bump chromium in DEPS to 122.0.6261.0 * chore: update patches * chore: restore patch that was mistakenly removed * 5181931: Improve LoginHandler (Part 9 / N)5181931
* Dispatch SiteInstanceGotProcess() only when both process and site are set.5142354
* 5171446: [AsyncSB] Pass navigation_id into CreateURLLoaderThrottles5171446
* 5213708: Move DownloadTargetInfo into components/download5213708
* extensions: Add a loader for Controlled Frame embedder scripts5202765
* [CSC][Zoom] Add initial_zoom_level to DisplayMediaInformation5168626
* chore: bump chromium in DEPS to 123.0.6262.0 * chore: bump chromium in DEPS to 122.0.6261.6 * fix: suppress clang -Wimplicit-const-int-float-conversion * fixup 5191363: Mark LOG(FATAL) [[noreturn]] for Windows5191363
* 5167921: Remove Widget::IsTranslucentWindowOpacitySupported5167921
Also 5148392: PinnedState: Support pinned state in PlatformWindowState |5148392
* fixup: 5180720: Polish tiled browser window UI on Linux5180720
* 5170669: clipboard: Migrate DOMException constructors to RejectWith-5170669
* 5178824: [Fullscreen] Record UKM data5178824
* chore: update patches after rebase --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
parent
921da723b8
commit
1a0991a9b9
99 changed files with 744 additions and 991 deletions
|
@ -15,7 +15,7 @@ short-circuit all the permissions checks in MSDC for now to allow us to
|
|||
unduplicate this code.
|
||||
|
||||
diff --git a/components/webrtc/media_stream_devices_controller.cc b/components/webrtc/media_stream_devices_controller.cc
|
||||
index be66cc8226fa719645701d5cf708ae91c2bf823d..6cf82318db3cc74b2387cb76583284df5ddaed4a 100644
|
||||
index e7aa270fce64dbf884393b08063890eb56f186a7..397a37518a094d2a538cefe9c3ff2ee85f7ef3ef 100644
|
||||
--- a/components/webrtc/media_stream_devices_controller.cc
|
||||
+++ b/components/webrtc/media_stream_devices_controller.cc
|
||||
@@ -57,7 +57,8 @@ bool PermissionIsRequested(blink::PermissionType permission,
|
||||
|
@ -28,20 +28,21 @@ index be66cc8226fa719645701d5cf708ae91c2bf823d..6cf82318db3cc74b2387cb76583284df
|
|||
content::RenderFrameHost* rfh = content::RenderFrameHost::FromID(
|
||||
request.render_process_id, request.render_frame_id);
|
||||
// The RFH may have been destroyed by the time the request is processed.
|
||||
@@ -93,6 +94,7 @@ void MediaStreamDevicesController::RequestPermissions(
|
||||
@@ -92,7 +93,7 @@ void MediaStreamDevicesController::RequestPermissions(
|
||||
std::move(callback)));
|
||||
|
||||
std::vector<blink::PermissionType> permission_types;
|
||||
|
||||
-
|
||||
+#if 0
|
||||
content::PermissionController* permission_controller =
|
||||
web_contents->GetBrowserContext()->GetPermissionController();
|
||||
|
||||
@@ -153,21 +155,27 @@ void MediaStreamDevicesController::RequestPermissions(
|
||||
permission_types.push_back(blink::PermissionType::CAMERA_PAN_TILT_ZOOM);
|
||||
}
|
||||
}
|
||||
@@ -165,19 +166,26 @@ void MediaStreamDevicesController::RequestPermissions(
|
||||
requested_audio_capture_device_ids;
|
||||
permission_request_description.requested_video_capture_device_ids =
|
||||
requested_video_capture_device_ids;
|
||||
-
|
||||
+#endif
|
||||
|
||||
// It is OK to ignore `request.security_origin` because it will be calculated
|
||||
// from `render_frame_host` and we always ignore `requesting_origin` for
|
||||
// `AUDIO_CAPTURE` and `VIDEO_CAPTURE`.
|
||||
|
@ -50,9 +51,7 @@ index be66cc8226fa719645701d5cf708ae91c2bf823d..6cf82318db3cc74b2387cb76583284df
|
|||
- rfh->GetBrowserContext()
|
||||
- ->GetPermissionController()
|
||||
- ->RequestPermissionsFromCurrentDocument(
|
||||
- rfh,
|
||||
- content::PermissionRequestDescription(permission_types,
|
||||
- request.user_gesture),
|
||||
- rfh, permission_request_description,
|
||||
- base::BindOnce(
|
||||
- &MediaStreamDevicesController::PromptAnsweredGroupedRequest,
|
||||
- std::move(controller)));
|
||||
|
@ -73,7 +72,7 @@ index be66cc8226fa719645701d5cf708ae91c2bf823d..6cf82318db3cc74b2387cb76583284df
|
|||
}
|
||||
|
||||
MediaStreamDevicesController::~MediaStreamDevicesController() {
|
||||
@@ -437,6 +445,7 @@ bool MediaStreamDevicesController::PermissionIsBlockedForReason(
|
||||
@@ -447,6 +455,7 @@ bool MediaStreamDevicesController::PermissionIsBlockedForReason(
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -81,7 +80,7 @@ index be66cc8226fa719645701d5cf708ae91c2bf823d..6cf82318db3cc74b2387cb76583284df
|
|||
// TODO(raymes): This function wouldn't be needed if
|
||||
// PermissionManager::RequestPermissions returned a denial reason.
|
||||
content::PermissionResult result =
|
||||
@@ -447,6 +456,7 @@ bool MediaStreamDevicesController::PermissionIsBlockedForReason(
|
||||
@@ -457,6 +466,7 @@ bool MediaStreamDevicesController::PermissionIsBlockedForReason(
|
||||
DCHECK_EQ(blink::mojom::PermissionStatus::DENIED, result.status);
|
||||
return true;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue