mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
* chore: bump chromium in DEPS to 146.0.7652.0 * fix(patch-conflict): update mas_avoid_private_macos_api_usage context for constrainFrameRect method The upstream CL added a new constrainFrameRect:toScreen: method override to NativeWidgetMacNSWindow as part of headless mode window zoom implementation. The MAS patch's #endif for frameViewClassForStyleMask now correctly appears after that method, since constrainFrameRect is a public API override that doesn't need to be guarded. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7487666 * fix(patch-conflict): update printing.patch for base::DictValue rename Updated printing.patch to use the new base::DictValue type name instead of base::Value::Dict following Chromium's type renaming change. This affects CompleteUpdatePrintSettings() signature and related code. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * fix(patch-conflict): update accessibility_ui patch for base::DictValue/ListValue rename Updated adjust_accessibility_ui_for_electron.patch to use the new base::DictValue and base::ListValue type names instead of base::Value::Dict and base::Value::List following Chromium's type renaming change. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * chore: update patches * 6625736: Rename DURABLE_STORAGE to PERSISTENT_STORAGE for consistency | https://chromium-review.googlesource.com/c/chromium/src/+/6625736 * chore: bump chromium in DEPS to 146.0.7653.0 * chore: update patches * 7000847: add type tag to v8::External for gin_helper function templates The upstream gin function templates now use v8::ExternalPointerTypeTag for type safety when using v8::External. Updated Electron's forked gin_helper function template to use the same kGinInternalCallbackHolderBaseTag that Chromium's gin uses. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * fix(patch-update): extend V8 Object API deprecation patch for Node.js Extended the existing patch to cover additional files that use GetAlignedPointerFromInternalField and SetAlignedPointerInInternalField: - src/stream_base-inl.h - src/udp_wrap.cc - src/js_udp_wrap.cc - src/node_process_methods.cc - src/node_snapshotable.cc - src/base_object.cc These APIs now require an EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * 7000847: add type tag to v8::External calls in shared_texture Updated v8::External::New and v8::External::Value calls to use the kExternalPointerTypeTagDefault tag as required by the V8 API change that deprecates the tagless versions. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * 7508687: use ChildProcessId for file permission APIs The ChildProcessSecurityPolicy::CanReadFile and GrantReadFile APIs now require ChildProcessId instead of int. Updated to use GetID() instead of GetDeprecatedID() for these specific calls. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7508687 * 7000847: add type tag to v8::External calls in callback and osr_converter The v8::External API now requires an EmbedderPointerTypeTag parameter for both New() and Value() methods to improve V8 sandbox type safety. Updated calls in: - callback.cc: TranslatorHolder constructor and CallTranslator - osr_converter.cc: OffscreenSharedTextureValue converter Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7000847 * fixup! 7087956: [api] Promote deprecation of v8::Context and v8::Object API methods Extended the Node.js patch to cover histogram.cc which also uses SetAlignedPointerInInternalField and GetAlignedPointerFromInternalField APIs that now require the EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * chore: bump chromium in DEPS to 146.0.7655.0 * chore: update patches * 7509043: update WebSpellingMarker type for API change The upstream Chromium API changed - WebSpellingMarker was moved from a nested type within WebTextCheckClient to a standalone type in the blink namespace. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509043 * 7498491: update process_id to use OriginatingProcess type The upstream Chromium API changed - URLLoaderFactoryParams::process_id was changed from an integer to a union type network::OriginatingProcess that distinguishes between browser and renderer processes. - For browser process requests, use OriginatingProcess::browser() - For renderer process lookups, check !is_browser() and use renderer_process().value() to get the child_id Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7498491 * 5710330: Add crash keys to debug NativeWidgetMacNSWindowBorderlessFrame exception | https://chromium-review.googlesource.com/c/chromium/src/+/5710330 5710330 added a new NSNextStepFrame interface extension and implementations for NativeWidgetMacNSWindowTitledFrame and NativeWidgetMacNSWindowBorderlessFrame. These use private macOS APIs that are not available in Mac App Store builds. * chore: update patches * chore: bump chromium in DEPS to 146.0.7661.0 * chore: bump chromium in DEPS to 146.0.7663.0 * fix(patch-conflict): update accessibility_ui for string_view API change Upstream removed redundant std::string(default_api_type) conversion as part of a string_view optimization cleanup. Updated patch context to match. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7514107 * fix(patch-conflict): update service process launch options for sandbox API refactor Upstream removed content/common/sandbox_init_win.cc and content/public/common/sandbox_init_win.h, moving the functionality directly into ChildProcessLauncherHelper. Updated patch to call sandbox::policy::SandboxWin::StartSandboxedProcess directly with the LaunchOptions pointer instead of going through the removed helper. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7528253 * fix(patch-conflict): update MAS safestorage for keychain API refactor Upstream refactored KeychainPassword::GetPassword() to use a new GetPasswordImpl() helper function with improved error tracking via base::expected<std::string, OSStatus>. Adapted patch to use the new GetPasswordImpl with the suffixed account name and handle migration from legacy accounts through the new API. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7516438 * chore: update patches * chore: bump chromium in DEPS to 146.0.7663.0 * fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: include new cookie exclusion reason https://chromium-review.googlesource.com/c/chromium/src/+/7486527 * fix: enable libc++ ABI flag for trivially copyable std::vector<bool> Required for changes introduced in the following CL https://chromium-review.googlesource.com/c/chromium/src/+/7513653 * fixup! fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: spellcheck not working in tests https://chromium-review.googlesource.com/c/chromium/src/+/7452579 * fix: cookie test failing due to multiple rejection reasons https://chromium-review.googlesource.com/c/chromium/src/+/7506629 * fix: macos sizing unmaximized window incorrectly https://chromium-review.googlesource.com/c/chromium/src/+/7487666 Changes to headless mode caused the unmaximized window to subtract the height of the menubar. * fix: skip tests for incompatible BoringSSL ML-DSA crypto https://boringssl-review.googlesource.com/c/boringssl/+/84929 * test: fix pseudonymization registration in utility process on Linux Ref: 7486913: Pass pseudonymization salt via shared memory at process launch | https://chromium-review.googlesource.com/c/chromium/src/+/7486913 * fix: restore MAS patch-outs Restores some `#if !IS_MAS_BUILD()` gates dropped in773054ad59* fixup! 7508687: use ChildProcessId for file permission APIs * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor * chore: add note about parallel upstream change * fixup! Merge remote-tracking branch 'origin/main' into roller/chromium/main * Revert "fixup! 7508687: use ChildProcessId for file permission APIs" This reverts commit05c43e4e5d. The _impl version has the signature, but not the public interface. :oof: * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor --------- 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: Samuel Maddock <samuelmaddock@electronjs.org> Co-authored-by: clavin <clavin@electronjs.org>
222 lines
8.2 KiB
C++
222 lines
8.2 KiB
C++
// Copyright (c) 2013 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef ELECTRON_SHELL_BROWSER_ELECTRON_BROWSER_CONTEXT_H_
|
|
#define ELECTRON_SHELL_BROWSER_ELECTRON_BROWSER_CONTEXT_H_
|
|
|
|
#include <map>
|
|
#include <memory>
|
|
#include <optional>
|
|
#include <string>
|
|
#include <string_view>
|
|
#include <variant>
|
|
#include <vector>
|
|
|
|
#include "base/files/file_path.h"
|
|
#include "content/public/browser/browser_context.h"
|
|
#include "content/public/browser/media_stream_request.h"
|
|
#include "mojo/public/cpp/bindings/remote.h"
|
|
#include "services/network/public/mojom/ssl_config.mojom.h"
|
|
#include "third_party/blink/public/common/permissions/permission_utils.h"
|
|
|
|
class PrefService;
|
|
class ValueMapPrefStore;
|
|
|
|
namespace content {
|
|
class PreconnectManager;
|
|
} // namespace content
|
|
|
|
namespace gin {
|
|
class Arguments;
|
|
}
|
|
|
|
namespace network {
|
|
class SharedURLLoaderFactory;
|
|
}
|
|
|
|
namespace storage {
|
|
class SpecialStoragePolicy;
|
|
}
|
|
|
|
namespace electron {
|
|
|
|
class CookieChangeNotifier;
|
|
class ElectronDownloadManagerDelegate;
|
|
class ElectronPermissionManager;
|
|
class ElectronPreconnectManagerDelegate;
|
|
class MediaDeviceIDSalt;
|
|
class ProtocolRegistry;
|
|
class ResolveProxyHelper;
|
|
class WebViewManager;
|
|
|
|
using DisplayMediaResponseCallbackJs =
|
|
base::OnceCallback<void(gin::Arguments* args)>;
|
|
using DisplayMediaRequestHandler =
|
|
base::RepeatingCallback<void(const content::MediaStreamRequest&,
|
|
DisplayMediaResponseCallbackJs)>;
|
|
class ElectronBrowserContext : public content::BrowserContext {
|
|
public:
|
|
// disable copy
|
|
ElectronBrowserContext(const ElectronBrowserContext&) = delete;
|
|
ElectronBrowserContext& operator=(const ElectronBrowserContext&) = delete;
|
|
|
|
[[nodiscard]] static std::vector<ElectronBrowserContext*> BrowserContexts();
|
|
|
|
[[nodiscard]] static bool IsValidContext(const void* context);
|
|
|
|
// Get or create the default BrowserContext.
|
|
static ElectronBrowserContext* GetDefaultBrowserContext(
|
|
base::DictValue options = {});
|
|
|
|
// Get or create the BrowserContext according to its |partition| and
|
|
// |in_memory|. The |options| will be passed to constructor when there is no
|
|
// existing BrowserContext.
|
|
static ElectronBrowserContext* From(const std::string& partition,
|
|
bool in_memory,
|
|
base::DictValue options = {});
|
|
|
|
// Get or create the BrowserContext using the |path|.
|
|
// The |options| will be passed to constructor when there is no
|
|
// existing BrowserContext.
|
|
static ElectronBrowserContext* FromPath(const base::FilePath& path,
|
|
base::DictValue options = {});
|
|
|
|
static void DestroyAllContexts();
|
|
|
|
void SetUserAgent(const std::string& user_agent);
|
|
std::string GetUserAgent() const;
|
|
bool can_use_http_cache() const { return use_cache_; }
|
|
int max_cache_size() const { return max_cache_size_; }
|
|
ResolveProxyHelper* GetResolveProxyHelper();
|
|
content::PreconnectManager* GetPreconnectManager();
|
|
scoped_refptr<network::SharedURLLoaderFactory> GetURLLoaderFactory();
|
|
|
|
std::string GetMediaDeviceIDSalt();
|
|
|
|
// content::BrowserContext:
|
|
base::FilePath GetPath() const override;
|
|
bool IsOffTheRecord() override;
|
|
std::unique_ptr<content::ZoomLevelDelegate> CreateZoomLevelDelegate(
|
|
const base::FilePath& partition_path) override;
|
|
content::PushMessagingService* GetPushMessagingService() override;
|
|
content::SSLHostStateDelegate* GetSSLHostStateDelegate() override;
|
|
content::BackgroundFetchDelegate* GetBackgroundFetchDelegate() override;
|
|
content::BackgroundSyncController* GetBackgroundSyncController() override;
|
|
content::BrowsingDataRemoverDelegate* GetBrowsingDataRemoverDelegate()
|
|
override;
|
|
content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
|
|
content::BrowserPluginGuestManager* GetGuestManager() override;
|
|
content::PlatformNotificationService* GetPlatformNotificationService()
|
|
override;
|
|
content::PermissionControllerDelegate* GetPermissionControllerDelegate()
|
|
override;
|
|
storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
|
|
content::ClientHintsControllerDelegate* GetClientHintsControllerDelegate()
|
|
override;
|
|
content::StorageNotificationService* GetStorageNotificationService() override;
|
|
content::ReduceAcceptLanguageControllerDelegate*
|
|
GetReduceAcceptLanguageControllerDelegate() override;
|
|
content::FileSystemAccessPermissionContext*
|
|
GetFileSystemAccessPermissionContext() override;
|
|
|
|
CookieChangeNotifier* cookie_change_notifier() const {
|
|
return cookie_change_notifier_.get();
|
|
}
|
|
PrefService* prefs() const { return prefs_.get(); }
|
|
ValueMapPrefStore* in_memory_pref_store() const {
|
|
return in_memory_pref_store_.get();
|
|
}
|
|
|
|
ProtocolRegistry* protocol_registry() const {
|
|
return protocol_registry_.get();
|
|
}
|
|
|
|
void SetSSLConfig(network::mojom::SSLConfigPtr config);
|
|
network::mojom::SSLConfigPtr GetSSLConfig();
|
|
void SetSSLConfigClient(mojo::Remote<network::mojom::SSLConfigClient> client);
|
|
|
|
bool ChooseDisplayMediaDevice(const content::MediaStreamRequest& request,
|
|
content::MediaResponseCallback callback);
|
|
void SetDisplayMediaRequestHandler(DisplayMediaRequestHandler handler);
|
|
|
|
~ElectronBrowserContext() override;
|
|
|
|
// Grants |origin| access to |device|.
|
|
// To be used in place of ObjectPermissionContextBase::GrantObjectPermission.
|
|
void GrantDevicePermission(const url::Origin& origin,
|
|
const base::Value& device,
|
|
blink::PermissionType permissionType);
|
|
|
|
// Revokes |origin| access to |device|.
|
|
// To be used in place of ObjectPermissionContextBase::RevokeObjectPermission.
|
|
void RevokeDevicePermission(const url::Origin& origin,
|
|
const base::Value& device,
|
|
blink::PermissionType permission_type);
|
|
|
|
// Returns the list of devices that |origin| has been granted permission to
|
|
// access. To be used in place of
|
|
// ObjectPermissionContextBase::GetGrantedObjects.
|
|
bool CheckDevicePermission(const url::Origin& origin,
|
|
const base::Value& device,
|
|
blink::PermissionType permissionType);
|
|
|
|
private:
|
|
using DevicePermissionMap = std::map<
|
|
blink::PermissionType,
|
|
std::map<url::Origin, std::vector<std::unique_ptr<base::Value>>>>;
|
|
|
|
using PartitionOrPath =
|
|
std::variant<std::reference_wrapper<const std::string>,
|
|
std::reference_wrapper<const base::FilePath>>;
|
|
|
|
ElectronBrowserContext(const PartitionOrPath partition_location,
|
|
bool in_memory,
|
|
base::DictValue options);
|
|
|
|
ElectronBrowserContext(base::FilePath partition, base::DictValue options);
|
|
|
|
static void DisplayMediaDeviceChosen(
|
|
const content::MediaStreamRequest& request,
|
|
content::MediaResponseCallback callback,
|
|
gin::Arguments* args);
|
|
|
|
// Initialize pref registry.
|
|
void InitPrefs();
|
|
|
|
scoped_refptr<ValueMapPrefStore> in_memory_pref_store_;
|
|
std::unique_ptr<CookieChangeNotifier> cookie_change_notifier_;
|
|
std::unique_ptr<PrefService> prefs_;
|
|
std::unique_ptr<ElectronDownloadManagerDelegate> download_manager_delegate_;
|
|
std::unique_ptr<WebViewManager> guest_manager_;
|
|
std::unique_ptr<ElectronPermissionManager> permission_manager_;
|
|
std::unique_ptr<MediaDeviceIDSalt> media_device_id_salt_;
|
|
scoped_refptr<ResolveProxyHelper> resolve_proxy_helper_;
|
|
scoped_refptr<storage::SpecialStoragePolicy> storage_policy_;
|
|
std::unique_ptr<content::PreconnectManager> preconnect_manager_;
|
|
std::unique_ptr<ElectronPreconnectManagerDelegate>
|
|
preconnect_manager_delegate_;
|
|
std::unique_ptr<ProtocolRegistry> protocol_registry_;
|
|
|
|
std::optional<std::string> user_agent_;
|
|
base::FilePath path_;
|
|
bool in_memory_ = false;
|
|
bool use_cache_ = true;
|
|
int max_cache_size_ = 0;
|
|
|
|
// Shared URLLoaderFactory.
|
|
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
|
|
|
|
network::mojom::SSLConfigPtr ssl_config_;
|
|
mojo::Remote<network::mojom::SSLConfigClient> ssl_config_client_;
|
|
|
|
DisplayMediaRequestHandler display_media_request_handler_;
|
|
|
|
// In-memory cache that holds objects that have been granted permissions.
|
|
DevicePermissionMap granted_devices_;
|
|
};
|
|
|
|
} // namespace electron
|
|
|
|
#endif // ELECTRON_SHELL_BROWSER_ELECTRON_BROWSER_CONTEXT_H_
|