mirror of
https://github.com/electron/electron.git
synced 2026-01-06 22:24:03 -05:00
* chore: bump chromium in DEPS to 145.0.7572.0 * chore: update patches (trivial only) * chore(patch-conflict): feat_filter_out_non-shareable_windows_in_the_current_application_in.patch Polished the edits and formatted the result. No real changes. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7232079 "7232079: Use WindowsToExclude to exclude PiP window in macOS screencapture device" * chore(patch-conflict): feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7214586 "7214586: Refactor SelectFileDialogLinuxPortal to request XDG portal on demand" Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7237910 "7237910: Remove g_gtk_ui global" * 7228586: Migrate SystemMemoryInfo from ByteCount to ByteSize Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7228586 * 7207583: GlobalRenderFrameHostId to ChildProcessId Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7207583 * 7205548: Remove uses of BodyAsStringCallbackDeprecated (extensions/) Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7205548 * chore: bump chromium in DEPS to 145.0.7574.0 * chore: update libc++ filenames * chore: update patches (trivial only) * chore(patch-conflict): feat_filter_out_non-shareable_windows_in_the_current_application_in.patch Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7246150 "7246150: Fix crash in ScreenCaptureKitDeviceMac due to null PIPScreenCaptureCoordinator" * fixup! chore(patch-conflict): feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch * fixup! chore(patch-conflict): feat_filter_out_non-shareable_windows_in_the_current_application_in.patch * 7239572: [OOPIF PDF] Enable OOPIF PDF by default on Windows/macOS/Linux Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7239572 * chore: bump chromium in DEPS to 145.0.7576.0 * fixup! chore(patch-conflict): feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch * chore: update patches (trivial only) * chore: add note to keep patch that was upstreamed but reverted fix_restore_original_resize_performance_on_macos.patch was organically upstreamed but that change got reverted just after the current roll's cutoff. I've added a note in the patch contents so the patch sticks around and so we can keep it after the revert is included. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7255334 "7255334: Revert 'Fix jank when resizing browser window'" * chore: bump chromium in DEPS to 145.0.7577.0 * chore: update patches (trivial only) * chore(patch-conflict): keep patch after revert Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7255334 "7255334: Revert 'Fix jank when resizing browser window'" * 7237910: Remove g_gtk_ui global I tried to find a way to avoid the patch, but other approaches seemed complex and involved. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7237910 * 7251900: Reland "Remove callback_helpers.h include from is_callback.h (try 5)" Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7251900 * 7170174: [LNA] Retry requests for cached local resources Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7170174 * fix: PDFs use OOPIF (behavior change) * fixup! 7237910: Remove g_gtk_ui global * fixup! 7251900: Reland "Remove callback_helpers.h include from is_callback.h (try 5)" --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org>
143 lines
5.9 KiB
Diff
143 lines
5.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Charles Kerr <charles@charleskerr.com>
|
|
Date: Wed, 17 May 2023 14:42:09 -0500
|
|
Subject: chore: patch out Profile methods
|
|
|
|
Electron does not support Profiles, so we need to patch it out of any
|
|
code that we use.
|
|
|
|
diff --git a/chrome/browser/pdf/chrome_pdf_stream_delegate.cc b/chrome/browser/pdf/chrome_pdf_stream_delegate.cc
|
|
index 21d5ab99800c0830cc31ec4ebb24e3f05cd904d8..3f8f514519d6e4a0abe3690f5df35de8ffae6fd4 100644
|
|
--- a/chrome/browser/pdf/chrome_pdf_stream_delegate.cc
|
|
+++ b/chrome/browser/pdf/chrome_pdf_stream_delegate.cc
|
|
@@ -45,6 +45,7 @@ namespace {
|
|
// hierarchy is: enterprise policy > user choice > finch experiment.
|
|
bool ShouldEnableSkiaRenderer(content::WebContents* contents) {
|
|
CHECK(contents);
|
|
+#if 0
|
|
const PrefService* prefs =
|
|
Profile::FromBrowserContext(contents->GetBrowserContext())->GetPrefs();
|
|
|
|
@@ -52,6 +53,7 @@ bool ShouldEnableSkiaRenderer(content::WebContents* contents) {
|
|
if (prefs->IsManagedPreference(prefs::kPdfUseSkiaRendererEnabled)) {
|
|
return prefs->GetBoolean(prefs::kPdfUseSkiaRendererEnabled);
|
|
}
|
|
+#endif
|
|
|
|
// When the enterprise policy is not set, use finch/feature flag choice.
|
|
return base::FeatureList::IsEnabled(
|
|
@@ -63,6 +65,7 @@ bool ShouldEnableSkiaRenderer(content::WebContents* contents) {
|
|
// priority hierarchy is: enterprise policy > user choice > finch experiment.
|
|
bool ShouldEnableXfaForms(content::WebContents* contents) {
|
|
CHECK(contents);
|
|
+#if 0
|
|
const PrefService* prefs =
|
|
Profile::FromBrowserContext(contents->GetBrowserContext())->GetPrefs();
|
|
|
|
@@ -70,6 +73,7 @@ bool ShouldEnableXfaForms(content::WebContents* contents) {
|
|
if (prefs->IsManagedPreference(prefs::kPdfXfaFormsEnabled)) {
|
|
return prefs->GetBoolean(prefs::kPdfXfaFormsEnabled);
|
|
}
|
|
+#endif
|
|
|
|
// When the enterprise policy is not set, use finch/feature flag choice.
|
|
return base::FeatureList::IsEnabled(chrome_pdf::features::kPdfXfaSupport);
|
|
diff --git a/chrome/browser/pdf/pdf_extension_util.cc b/chrome/browser/pdf/pdf_extension_util.cc
|
|
index 328abdd79d287225d0e6ec6becc455e169d6e5d0..10e5e702a43dbb70e13d00b48000e0b4cc974e7a 100644
|
|
--- a/chrome/browser/pdf/pdf_extension_util.cc
|
|
+++ b/chrome/browser/pdf/pdf_extension_util.cc
|
|
@@ -248,10 +248,13 @@ bool IsPrintingEnabled(content::BrowserContext* context) {
|
|
|
|
#if BUILDFLAG(ENABLE_PDF_INK2)
|
|
bool IsPdfAnnotationsEnabledByPolicy(content::BrowserContext* context) {
|
|
+# if 0
|
|
PrefService* prefs =
|
|
context ? Profile::FromBrowserContext(context)->GetPrefs() : nullptr;
|
|
return !prefs || !prefs->IsManagedPreference(prefs::kPdfAnnotationsEnabled) ||
|
|
prefs->GetBoolean(prefs::kPdfAnnotationsEnabled);
|
|
+#endif
|
|
+ return true;
|
|
}
|
|
#endif // BUILDFLAG(ENABLE_PDF_INK2)
|
|
|
|
diff --git a/chrome/browser/profiles/profile_selections.cc b/chrome/browser/profiles/profile_selections.cc
|
|
index bc0bad82ebcdceadc505e912ff27202b452fefab..6b77c57fccc4619a1df3b4ed661d2bdd60960228 100644
|
|
--- a/chrome/browser/profiles/profile_selections.cc
|
|
+++ b/chrome/browser/profiles/profile_selections.cc
|
|
@@ -13,6 +13,7 @@
|
|
#endif // BUILDFLAG(IS_CHROMEOS)
|
|
|
|
bool AreKeyedServicesDisabledForProfileByDefault(const Profile* profile) {
|
|
+#if 0
|
|
// By default disable all services for System Profile.
|
|
// Even though having no services is also the default value for Guest Profile,
|
|
// this is not really the case in practice because a lot of Service Factories
|
|
@@ -20,7 +21,7 @@ bool AreKeyedServicesDisabledForProfileByDefault(const Profile* profile) {
|
|
if (profile && profile->IsSystemProfile()) {
|
|
return true;
|
|
}
|
|
-
|
|
+#endif
|
|
return false;
|
|
}
|
|
|
|
@@ -104,6 +105,7 @@ ProfileSelections ProfileSelections::BuildRedirectedInIncognito() {
|
|
}
|
|
|
|
Profile* ProfileSelections::ApplyProfileSelection(Profile* profile) const {
|
|
+#if 0
|
|
CHECK(profile);
|
|
|
|
ProfileSelection selection = GetProfileSelection(profile);
|
|
@@ -119,6 +121,9 @@ Profile* ProfileSelections::ApplyProfileSelection(Profile* profile) const {
|
|
case ProfileSelection::kOffTheRecordOnly:
|
|
return profile->IsOffTheRecord() ? profile : nullptr;
|
|
}
|
|
+#else
|
|
+ return nullptr;
|
|
+#endif
|
|
}
|
|
|
|
ProfileSelection ProfileSelections::GetProfileSelection(
|
|
diff --git a/chrome/browser/spellchecker/spellcheck_service.cc b/chrome/browser/spellchecker/spellcheck_service.cc
|
|
index 13d39ca423abc89e70f277ac06a8b1b1212dbeea..a13a50fd89a5085870a0b6e3a30fd025ca0cf386 100644
|
|
--- a/chrome/browser/spellchecker/spellcheck_service.cc
|
|
+++ b/chrome/browser/spellchecker/spellcheck_service.cc
|
|
@@ -21,8 +21,10 @@
|
|
#include "base/synchronization/waitable_event.h"
|
|
#include "base/values.h"
|
|
#include "build/build_config.h"
|
|
+#if 0
|
|
#include "chrome/browser/profiles/profile.h"
|
|
#include "chrome/browser/profiles/profiles_state.h"
|
|
+#endif
|
|
#include "chrome/browser/spellchecker/spellcheck_factory.h"
|
|
#include "chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h"
|
|
#include "components/language/core/browser/pref_names.h"
|
|
@@ -67,7 +69,10 @@ SpellcheckService::SpellCheckerBinder& GetSpellCheckerBinderOverride() {
|
|
// Only record spelling-configuration metrics for profiles in which the user
|
|
// can configure spelling.
|
|
bool RecordSpellingConfigurationMetrics(content::BrowserContext* context) {
|
|
+#if 0
|
|
return profiles::IsRegularUserProfile(Profile::FromBrowserContext(context));
|
|
+#endif
|
|
+ return true;
|
|
}
|
|
|
|
} // namespace
|
|
diff --git a/chrome/browser/win/titlebar_config.cc b/chrome/browser/win/titlebar_config.cc
|
|
index 7898ea88ca529660e52c1f9e2517d6f016b740a5..114046912999f4ca9d21f7d5859d14ecaaab9f56 100644
|
|
--- a/chrome/browser/win/titlebar_config.cc
|
|
+++ b/chrome/browser/win/titlebar_config.cc
|
|
@@ -12,8 +12,10 @@
|
|
|
|
bool ShouldBrowserCustomDrawTitlebar(BrowserView* browser_view) {
|
|
return !ShouldDefaultThemeUseMicaTitlebar() ||
|
|
+#if 0
|
|
!ThemeServiceFactory::GetForProfile(browser_view->GetProfile())
|
|
->UsingSystemTheme() ||
|
|
+#endif
|
|
(!browser_view->browser()->is_type_normal() &&
|
|
!browser_view->browser()->is_type_popup() &&
|
|
!browser_view->browser()->is_type_devtools());
|