chore: bump chromium to 124.0.6331.0 (30-x-y) (#41515)
* chore: bump chromium in DEPS to 124.0.6329.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 5319449: Activate popups after async opener fullscreen exit transitions |5319449
Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 5321532: [//ui] Remove ContextFactory::SharedMainThreadContextProvider() |5321532
Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * fixup! 5319449: Activate popups after async opener fullscreen exit transitions |5319449
Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 5319141: [OOPIF PDF] Create PdfNavigationThrottle for main frame navigations |5319141
Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * test: disable webview.capturePage test for mac arm64 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * chore: bump chromium in DEPS to 124.0.6337.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> * build: roll back DEPS to 124.0.6331.0 Co-authored-by: VerteDinde <vertedinde@electronjs.org> --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org>
This commit is contained in:
parent
333ee6d51a
commit
058c6b4af7
50 changed files with 225 additions and 239 deletions
|
@ -13,7 +13,7 @@ returning Result::ERROR_PERMANENT on the next invocation of
|
|||
CaptureFrame().
|
||||
|
||||
diff --git a/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc b/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc
|
||||
index 40764de7aeb463a6e2b8d90f273fef40b1dd3691..a5df76b0cdecd1e2e68f2f25c80c6b17de8bc808 100644
|
||||
index 81caa9bd2d97ec73120c07c17d7290b2c3c5d598..3ba5267bf5c7de420131b2c14fcadffd1f5b1326 100644
|
||||
--- a/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc
|
||||
+++ b/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc
|
||||
@@ -111,6 +111,7 @@ void BaseCapturerPipeWire::OnScreenCastRequestResult(RequestResponse result,
|
||||
|
@ -22,5 +22,5 @@ index 40764de7aeb463a6e2b8d90f273fef40b1dd3691..a5df76b0cdecd1e2e68f2f25c80c6b17
|
|||
options_.screencast_stream()->StopScreenCastStream();
|
||||
+ capturer_failed_ = true;
|
||||
}
|
||||
capturer_failed_ = true;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue