![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 141.0.7352.0 * chore: update patches * 6830573: Revert 'Migrate WrappableWithNamedPropertyInterceptor to gin::Wrappable' | https://chromium-review.googlesource.com/c/chromium/src/+/6830573 * chore: bump chromium in DEPS to 141.0.7354.0 * chore: bump chromium in DEPS to 141.0.7356.0 * chore: bump chromium in DEPS to 141.0.7357.0 * chore: bump chromium in DEPS to 141.0.7359.0 * chore: bump chromium in DEPS to 141.0.7361.0 * 6838518: [Mac] Correctly deallocate sandbox error buffers and prevent crash resulting from nullptr assignment | https://chromium-review.googlesource.com/c/chromium/src/+/6838518 * 6850973: Reland "Use base::ByteCount in base::SysInfo." | https://chromium-review.googlesource.com/c/chromium/src/+/6850973 * 6506565: [FPF-CI] Create initial NoiseHash in the browser. | https://chromium-review.googlesource.com/c/chromium/src/+/6506565 * chore: update patches * fixup! 6850973: Reland "Use base::ByteCount in base::SysInfo." | https://chromium-review.googlesource.com/c/chromium/src/+/6850973 * fixup! 6506565: [FPF-CI] Create initial NoiseHash in the browser. | https://chromium-review.googlesource.com/c/chromium/src/+/6506565 * fix: unsafe buffer warning in fix_properly_honor_printing_page_ranges.patch * fix: FTBFS in src_remove_dependency_on_wrapper-descriptor-based_cppheap.patch This change should be upstreamed. Fixes this error: ../../third_party/electron_node/src/env.cc:606:3: error: no matching function for call to 'Wrap' 606 | v8::Object::Wrap<v8::CppHeapPointerTag::kDefaultTag>( | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../../v8/include/v8-object.h:1076:14: note: candidate function template not viable: cannot convert argument of incomplete type 'void *' to 'v8::Object::Wrappable *' for 3rd argument 1076 | void Object::Wrap(v8::Isolate* isolate, const v8::Local<v8::Object>& wrapper, | ^ 1077 | v8::Object::Wrappable* wrappable) { | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../../v8/include/v8-object.h:1084:14: note: candidate function template not viable: no known conversion from 'Local<Object>' to 'const PersistentBase<Object>' for 2nd argument 1084 | void Object::Wrap(v8::Isolate* isolate, const PersistentBase<Object>& wrapper, | ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../../v8/include/v8-object.h:1093:14: note: candidate function template not viable: no known conversion from 'Local<Object>' to 'const BasicTracedReference<Object>' for 2nd argument 1093 | void Object::Wrap(v8::Isolate* isolate, | ^ 1094 | const BasicTracedReference<Object>& wrapper, | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. * [v8-init] Access crash key only from main thread | https://chromium-review.googlesource.com/c/chromium/src/+/6827167 * chore: e patches all * chore: remove chore_restore_some_deprecated_wrapper_utility_in_gin.patch from patches this remove line got re-added when rebasing roller/chromium/main * chore: e patches all * fix: include base/time/time.h when using base::Time * chore: update patches * Make --host-rules an alias for --host-resolver-rules. Refs https://chromium-review.googlesource.com/c/chromium/src/+/4867872 * ci: update BUILD_TOOLS_SHA Refs https://github.com/electron/build-tools/pull/746 * [Fontations] Remove Fontations suffix from font names Refs https://chromium-review.googlesource.com/c/chromium/src/+/6835930 * temp: debug macOS addon build failure * Revert "temp: debug macOS addon build failure" This reverts commit 40bc8abab65dc83e17c4ab97cb6e7522a193fb44. * test: run tests with Xcode 16.4 * ci: fix tccdb update for macOS 15 * spec: disable opening external application for loadURL on macOS opening unknown external application will bring up dialog to choose apps from application store which will break our other test suites that want to capture screen for pixel matching. The loadURL spec that tests bad-scheme://foo is sufficient that we hit the permission handler for openExternal since at that point we already know the runtime gave up on handling the scheme. * chore: rebase patches * chore: disable codesiging tests * ci: update ScreenCaptureApprovals.plist for /bin/bash * ci: try updating tcc permissions * ci: update TCC permissions Refs https://www.rainforestqa.com/blog/macos-tcc-db-deep-dive * chore: test with 1st quadrant of the window * chore: adjust for macOS 15 menubar height --------- 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: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
126 lines
5.3 KiB
Diff
126 lines
5.3 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 c390a83277f564f1a67a7dcffa36b9d77a35bc0b..b13273a4b194ad5e8ca2d1639ebca831f9607b1e 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(
|
|
diff --git a/chrome/browser/pdf/pdf_extension_util.cc b/chrome/browser/pdf/pdf_extension_util.cc
|
|
index 1362d0c69043ac5d1f7e72cf7ac72c272193844c..08efd98ca16555f6a7bbfb4ae3165130e843c981 100644
|
|
--- a/chrome/browser/pdf/pdf_extension_util.cc
|
|
+++ b/chrome/browser/pdf/pdf_extension_util.cc
|
|
@@ -271,10 +271,13 @@ bool IsPrintingEnabled(content::BrowserContext* context) {
|
|
|
|
#if BUILDFLAG(IS_CHROMEOS) || 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(IS_CHROMEOS) || 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 4c52386f9ddf13f1453903cda3954b6c596028f2..8fbb2025d157e58c90c701f9e3478f6c99b88aa1 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());
|