github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove old patch and lint

Browse Source
This commit is contained in:
George Xu
2025-01-31 13:31:09 -08:00
parent eaa952361c
commit 0cdf1012bb
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/browser/api/session.ts
View File

@@ -1,6 +1,7 @@
import { fetchWithSession } from '@electron/internal/browser/api/net-fetch';
import { addIpcDispatchListeners } from '@electron/internal/browser/ipc-dispatch';
import * as deprecate from '@electron/internal/common/deprecate';
import { desktopCapturer, net } from 'electron/main';
const { fromPartition, fromPath, Session } = process._linkedBinding('electron_browser_session');

27
patches/chromium/feat_make_macos_sccontentsharingpicker_work_in_electron_and_return_screen_window_or_both.patch
View File

@@ -1,5 +1,5 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: George Xu <georgexu99@electronjs.org>
From: Keeley Hammond <khammond@slack-corp.com>
Date: Tue, 14 Jan 2025 15:50:29 -0800
Subject: feat: allow desktop capturer to return either screen, window or both
and make MacOS SCContentSharingPicker work in Electron
@@ -66,7 +66,7 @@ index 08400be4d1bae18502d19beed6b2d9057e55dd4f..d83487885d566336d72bc5c4232d50a6
Refresh(refresh_thumbnails);
}
diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
index 0ac8e20073bd2db507e49200fd0b48f8535d666b..8ba45b1bd58de2b0f8661b1432bfdf0489c73ca9 100644
index 0ac8e20073bd2db507e49200fd0b48f8535d666b..ffea8d7c257fc68a66a9804d45861131e4716b63 100644
--- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
+++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
@@ -46,6 +46,7 @@
@@ -89,18 +89,17 @@ index 0ac8e20073bd2db507e49200fd0b48f8535d666b..8ba45b1bd58de2b0f8661b1432bfdf04
break;
}
NOTREACHED();
@@ -411,8 +413,8 @@ NativeDesktopMediaList::Worker::Worker(
@@ -411,7 +413,8 @@ NativeDesktopMediaList::Worker::Worker(
nullptr) {
DCHECK(capturer_);
- DCHECK(source_type_ == DesktopMediaID::Type::TYPE_WINDOW ||
- !add_current_process_windows_);
+ // DCHECK(source_type_ == DesktopMediaID::Type::TYPE_WINDOW ||
+ // !add_current_process_windows_);
+ DCHECK(source_type_ == DesktopMediaID::Type::TYPE_WINDOW || source_type_ ==
+ DesktopMediaID::Type::TYPE_NONE ||
!add_current_process_windows_);
}
NativeDesktopMediaList::Worker::~Worker() {
@@ -545,17 +547,33 @@ NativeDesktopMediaList::Worker::FormatSources(
@@ -545,17 +548,33 @@ NativeDesktopMediaList::Worker::FormatSources(
break;
case DesktopMediaID::Type::TYPE_WINDOW:
@@ -134,7 +133,7 @@ index 0ac8e20073bd2db507e49200fd0b48f8535d666b..8ba45b1bd58de2b0f8661b1432bfdf04
#if BUILDFLAG(IS_CHROMEOS_LACROS)
// We need to communicate this in_process_id to
// |RefreshForVizFrameSinkWindows|, so we'll use the window_id. If
@@ -820,14 +838,10 @@ NativeDesktopMediaList::NativeDesktopMediaList(
@@ -820,14 +839,10 @@ NativeDesktopMediaList::NativeDesktopMediaList(
is_source_list_delegated_(capturer->GetDelegatedSourceListController() !=
nullptr) {
type_ = type;
@@ -150,7 +149,7 @@ index 0ac8e20073bd2db507e49200fd0b48f8535d666b..8ba45b1bd58de2b0f8661b1432bfdf04
base::MessagePumpType thread_type = base::MessagePumpType::UI;
#else
base::MessagePumpType thread_type = base::MessagePumpType::DEFAULT;
@@ -839,8 +853,9 @@ NativeDesktopMediaList::NativeDesktopMediaList(
@@ -839,8 +854,9 @@ NativeDesktopMediaList::NativeDesktopMediaList(
std::move(capturer), add_current_process_windows_,
auto_show_delegated_source_list);
@@ -242,7 +241,7 @@ index 47a5ad2b7e2bc86a614488fd3fe85da1e3e2d6f2..fcc63aaf488b598db705e07274914ead
case DesktopMediaList::Type::kWebContents:
return false;
diff --git a/content/browser/media/capture/desktop_capture_device.cc b/content/browser/media/capture/desktop_capture_device.cc
index 835c1e860501bcc8cb7c7dfe192c113de3d623ff..2ea8dc71c864137d33ed29255881babb1630779f 100644
index 6618477648b7148ba66f5bb695be8eb6da045849..a8888d359324a826a2c8188e8631b643a8e1df5d 100644
--- a/content/browser/media/capture/desktop_capture_device.cc
+++ b/content/browser/media/capture/desktop_capture_device.cc
@@ -808,7 +808,6 @@ std::unique_ptr<media::VideoCaptureDevice> DesktopCaptureDevice::Create(
@@ -339,10 +338,10 @@ index f3dbdd0db5f6c3d07b600f3dfa3267d0a5a57b81..2b37a27d37a994694855afed441ae82f
}
diff --git a/content/browser/media/capture/screen_capture_kit_device_mac.mm b/content/browser/media/capture/screen_capture_kit_device_mac.mm
index ebfc2bb1006950dcff8e8f8792779c414c870a0b..a864d9e892dc6051aaf884b7fe6a502eff3e705e 100644
index e99684a6b70f5d344cfcd4b1271c4abb349f3797..a2c3f28de65d35bc81a3d49c7ae777613a7a4b3e 100644
--- a/content/browser/media/capture/screen_capture_kit_device_mac.mm
+++ b/content/browser/media/capture/screen_capture_kit_device_mac.mm
@@ -341,6 +341,7 @@ void OnShareableContentCreated(SCShareableContent* content) {
@@ -340,6 +340,7 @@ void OnShareableContentCreated(SCShareableContent* content) {
if (!fullscreen_module_) {
fullscreen_module_ = MaybeCreateScreenCaptureKitFullscreenModule(
device_task_runner_, *this, window);
@@ -350,7 +349,7 @@ index ebfc2bb1006950dcff8e8f8792779c414c870a0b..a864d9e892dc6051aaf884b7fe6a502e
}
}
}
@@ -702,6 +703,7 @@ void ResetStreamTo(SCWindow* window) override {
@@ -700,6 +701,7 @@ void ResetStreamTo(SCWindow* window) override {
SCContentFilter* filter) {
switch (source.type) {
case DesktopMediaID::TYPE_SCREEN: