* chore: bump chromium in DEPS to 146.0.7653.0
* chore: bump chromium in DEPS to 146.0.7653.1
* chore: bump chromium in DEPS to 146.0.7655.0
* chore: bump chromium in DEPS to 146.0.7657.1
* chore: bump chromium in DEPS to 146.0.7659.0
* chore: bump chromium in DEPS to 146.0.7661.0
* chore: bump chromium in DEPS to 146.0.7663.1
* chore: bump chromium in DEPS to 146.0.7665.1
* chore: bump chromium in DEPS to 146.0.7667.1
* chore: bump chromium in DEPS to 146.0.7668.2
* chore: bump chromium in DEPS to 146.0.7670.0
* chore: bump chromium in DEPS to 146.0.7672.1
* chore: bump chromium in DEPS to 146.0.7674.1
* chore: bump chromium in DEPS to 146.0.7676.1
* chore: bump chromium in DEPS to 146.0.7678.1
* chore: bump chromium in DEPS to 146.0.7680.1
* chore: bump chromium in DEPS to 146.0.7680.4
* chore: bump chromium in DEPS to 146.0.7680.0
* chore: bump chromium to 146.0.7666.0 (main) (#49528)
* 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 in 773054ad59
* 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 commit 05c43e4e5d2e0017275d6399818cd8e8254f29a0.
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>
(cherry picked from commit a65cfed500)
* chore: update patches after rebase
---------
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>
Co-authored-by: John Kleinschmidt <kleinschmidtorama@gmail.com>
305 lines
11 KiB
C++
305 lines
11 KiB
C++
// Copyright (c) 2018 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_API_ELECTRON_API_BASE_WINDOW_H_
|
|
#define ELECTRON_SHELL_BROWSER_API_ELECTRON_API_BASE_WINDOW_H_
|
|
|
|
#include <array>
|
|
#include <map>
|
|
#include <memory>
|
|
#include <optional>
|
|
#include <string>
|
|
#include <string_view>
|
|
#include <vector>
|
|
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "shell/browser/native_window_observer.h"
|
|
#include "shell/common/api/electron_api_native_image.h"
|
|
#include "shell/common/gin_helper/trackable_object.h"
|
|
|
|
namespace gin {
|
|
class Arguments;
|
|
} // namespace gin
|
|
|
|
namespace gin_helper {
|
|
class PersistentDictionary;
|
|
template <typename T>
|
|
class Handle;
|
|
} // namespace gin_helper
|
|
|
|
namespace electron {
|
|
|
|
class NativeWindow;
|
|
|
|
namespace api {
|
|
|
|
class View;
|
|
|
|
class BaseWindow : public gin_helper::TrackableObject<BaseWindow>,
|
|
private NativeWindowObserver {
|
|
public:
|
|
static gin_helper::WrappableBase* New(gin::Arguments* args);
|
|
|
|
static void BuildPrototype(v8::Isolate* isolate,
|
|
v8::Local<v8::FunctionTemplate> prototype);
|
|
|
|
const NativeWindow* window() const { return window_.get(); }
|
|
NativeWindow* window() { return window_.get(); }
|
|
|
|
protected:
|
|
// Common constructor.
|
|
BaseWindow(v8::Isolate* isolate, const gin_helper::Dictionary& options);
|
|
// Creating independent BaseWindow instance.
|
|
BaseWindow(gin::Arguments* args, const gin_helper::Dictionary& options);
|
|
~BaseWindow() override;
|
|
|
|
// TrackableObject:
|
|
void InitWith(v8::Isolate* isolate, v8::Local<v8::Object> wrapper) override;
|
|
|
|
// NativeWindowObserver:
|
|
void WillCloseWindow(bool* prevent_default) override;
|
|
void OnWindowClosed() override;
|
|
void OnWindowQueryEndSession(const std::vector<std::string>& reasons,
|
|
bool* prevent_default) override;
|
|
void OnWindowEndSession(const std::vector<std::string>& reasons) override;
|
|
void OnWindowBlur() override;
|
|
void OnWindowFocus() override;
|
|
void OnWindowShow() override;
|
|
void OnWindowHide() override;
|
|
void OnWindowMaximize() override;
|
|
void OnWindowUnmaximize() override;
|
|
void OnWindowMinimize() override;
|
|
void OnWindowRestore() override;
|
|
void OnWindowWillResize(const gfx::Rect& new_bounds,
|
|
gfx::ResizeEdge edge,
|
|
bool* prevent_default) override;
|
|
void OnWindowResize() override;
|
|
void OnWindowResized() override;
|
|
void OnWindowWillMove(const gfx::Rect& new_bounds,
|
|
bool* prevent_default) override;
|
|
void OnWindowMove() override;
|
|
void OnWindowMoved() override;
|
|
void OnWindowSwipe(const std::string& direction) override;
|
|
void OnWindowRotateGesture(float rotation) override;
|
|
void OnWindowSheetBegin() override;
|
|
void OnWindowSheetEnd() override;
|
|
void OnWindowEnterFullScreen() override;
|
|
void OnWindowLeaveFullScreen() override;
|
|
void OnWindowEnterHtmlFullScreen() override;
|
|
void OnWindowLeaveHtmlFullScreen() override;
|
|
void OnWindowAlwaysOnTopChanged() override;
|
|
void OnExecuteAppCommand(std::string_view command_name) override;
|
|
void OnTouchBarItemResult(const std::string& item_id,
|
|
const base::DictValue& details) override;
|
|
void OnNewWindowForTab() override;
|
|
void OnSystemContextMenu(int x, int y, bool* prevent_default) override;
|
|
#if BUILDFLAG(IS_WIN)
|
|
void OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) override;
|
|
#endif
|
|
|
|
// Public APIs of NativeWindow.
|
|
void SetContentView(gin_helper::Handle<View> view);
|
|
void Close();
|
|
virtual void CloseImmediately();
|
|
virtual void Focus();
|
|
virtual void Blur();
|
|
bool IsFocused() const;
|
|
virtual void Show();
|
|
virtual void ShowInactive();
|
|
void Hide();
|
|
bool IsVisible() const;
|
|
bool IsEnabled() const;
|
|
void SetEnabled(bool enable);
|
|
void Maximize();
|
|
void Unmaximize();
|
|
bool IsMaximized() const;
|
|
void Minimize();
|
|
void Restore();
|
|
bool IsMinimized() const;
|
|
void SetFullScreen(bool fullscreen);
|
|
bool IsFullscreen() const;
|
|
void SetBounds(const gfx::Rect& bounds, gin::Arguments* args);
|
|
gfx::Rect GetBounds() const;
|
|
void SetSize(int width, int height, gin::Arguments* args);
|
|
std::array<int, 2U> GetSize() const;
|
|
void SetContentSize(int width, int height, gin::Arguments* args);
|
|
std::array<int, 2U> GetContentSize() const;
|
|
void SetContentBounds(const gfx::Rect& bounds, gin::Arguments* args);
|
|
gfx::Rect GetContentBounds() const;
|
|
bool IsNormal() const;
|
|
gfx::Rect GetNormalBounds() const;
|
|
void SetMinimumSize(int width, int height);
|
|
std::array<int, 2U> GetMinimumSize() const;
|
|
void SetMaximumSize(int width, int height);
|
|
std::array<int, 2U> GetMaximumSize() const;
|
|
void SetSheetOffset(double offsetY, gin::Arguments* args);
|
|
void SetResizable(bool resizable);
|
|
bool IsResizable() const;
|
|
void SetMovable(bool movable);
|
|
void MoveAbove(const std::string& sourceId, gin::Arguments* args);
|
|
void MoveTop();
|
|
bool IsMovable() const;
|
|
void SetMinimizable(bool minimizable);
|
|
bool IsMinimizable() const;
|
|
void SetMaximizable(bool maximizable);
|
|
bool IsMaximizable() const;
|
|
void SetFullScreenable(bool fullscreenable);
|
|
bool IsFullScreenable() const;
|
|
void SetClosable(bool closable);
|
|
bool IsClosable() const;
|
|
void SetAlwaysOnTop(bool top, gin::Arguments* args);
|
|
bool IsAlwaysOnTop() const;
|
|
void Center();
|
|
void SetPosition(int x, int y, gin::Arguments* args);
|
|
std::array<int, 2U> GetPosition() const;
|
|
void SetTitle(const std::string& title);
|
|
std::string GetTitle() const;
|
|
void SetAccessibleTitle(const std::string& title);
|
|
std::string GetAccessibleTitle() const;
|
|
void FlashFrame(bool flash);
|
|
void SetSkipTaskbar(bool skip);
|
|
void SetExcludedFromShownWindowsMenu(bool excluded);
|
|
bool IsExcludedFromShownWindowsMenu() const;
|
|
void SetSimpleFullScreen(bool simple_fullscreen);
|
|
bool IsSimpleFullScreen() const;
|
|
void SetKiosk(bool kiosk);
|
|
bool IsKiosk() const;
|
|
bool IsTabletMode() const;
|
|
virtual void SetBackgroundColor(const std::string& color_name);
|
|
std::string GetBackgroundColor() const;
|
|
void InvalidateShadow();
|
|
void SetHasShadow(bool has_shadow);
|
|
bool HasShadow() const;
|
|
void SetOpacity(const double opacity);
|
|
double GetOpacity() const;
|
|
void SetShape(const std::vector<gfx::Rect>& rects);
|
|
void SetRepresentedFilename(const std::string& filename);
|
|
std::string GetRepresentedFilename() const;
|
|
void SetDocumentEdited(bool edited);
|
|
bool IsDocumentEdited() const;
|
|
void SetIgnoreMouseEvents(bool ignore, gin::Arguments* args);
|
|
void SetContentProtection(bool enable);
|
|
bool IsContentProtected() const;
|
|
void SetFocusable(bool focusable);
|
|
bool IsFocusable() const;
|
|
void SetMenu(v8::Isolate* isolate, v8::Local<v8::Value> menu);
|
|
void RemoveMenu();
|
|
void SetParentWindow(v8::Local<v8::Value> value, gin::Arguments* args);
|
|
std::string GetMediaSourceId() const;
|
|
v8::Local<v8::Value> GetNativeWindowHandle();
|
|
void SetProgressBar(double progress, gin::Arguments* args);
|
|
void SetOverlayIcon(const gfx::Image& overlay,
|
|
const std::string& description);
|
|
void SetVisibleOnAllWorkspaces(bool visible, gin::Arguments* args);
|
|
bool IsVisibleOnAllWorkspaces() const;
|
|
void SetAutoHideCursor(bool auto_hide);
|
|
virtual void SetVibrancy(v8::Isolate* isolate,
|
|
v8::Local<v8::Value> value,
|
|
gin::Arguments* args);
|
|
virtual void SetBackgroundMaterial(const std::string& material);
|
|
|
|
#if BUILDFLAG(IS_MAC)
|
|
std::string GetAlwaysOnTopLevel() const;
|
|
void SetWindowButtonVisibility(bool visible);
|
|
bool GetWindowButtonVisibility() const;
|
|
void SetWindowButtonPosition(std::optional<gfx::Point> position);
|
|
std::optional<gfx::Point> GetWindowButtonPosition() const;
|
|
|
|
bool IsHiddenInMissionControl();
|
|
void SetHiddenInMissionControl(bool hidden);
|
|
#endif
|
|
|
|
void SetTouchBar(std::vector<gin_helper::PersistentDictionary> items);
|
|
void RefreshTouchBarItem(const std::string& item_id);
|
|
void SetEscapeTouchBarItem(gin_helper::PersistentDictionary item);
|
|
void SelectPreviousTab();
|
|
void SelectNextTab();
|
|
void ShowAllTabs();
|
|
void MergeAllWindows();
|
|
void MoveTabToNewWindow();
|
|
void ToggleTabBar();
|
|
void AddTabbedWindow(NativeWindow* window, gin::Arguments* args);
|
|
v8::Local<v8::Value> GetTabbingIdentifier();
|
|
void SetAutoHideMenuBar(bool auto_hide);
|
|
bool IsMenuBarAutoHide() const;
|
|
void SetMenuBarVisibility(bool visible);
|
|
bool IsMenuBarVisible() const;
|
|
void SetAspectRatio(double aspect_ratio, gin::Arguments* args);
|
|
void PreviewFile(const std::string& path, gin::Arguments* args);
|
|
void CloseFilePreview();
|
|
void SetGTKDarkThemeEnabled(bool use_dark_theme);
|
|
|
|
// Public getters of NativeWindow.
|
|
v8::Local<v8::Value> GetContentView() const;
|
|
v8::Local<v8::Value> GetParentWindow() const;
|
|
std::vector<v8::Local<v8::Object>> GetChildWindows() const;
|
|
bool IsModal() const;
|
|
|
|
// Extra APIs added in JS.
|
|
bool SetThumbarButtons(gin::Arguments* args);
|
|
#if defined(TOOLKIT_VIEWS)
|
|
void SetIcon(v8::Isolate* isolate, v8::Local<v8::Value> icon);
|
|
void SetIconImpl(v8::Isolate* isolate,
|
|
v8::Local<v8::Value> icon,
|
|
NativeImage::OnConvertError on_error);
|
|
#endif
|
|
#if BUILDFLAG(IS_WIN)
|
|
typedef base::RepeatingCallback<void(v8::Local<v8::Value>,
|
|
v8::Local<v8::Value>)>
|
|
MessageCallback;
|
|
bool HookWindowMessage(UINT message, const MessageCallback& callback);
|
|
bool IsWindowMessageHooked(UINT message);
|
|
void UnhookWindowMessage(UINT message);
|
|
void UnhookAllWindowMessages();
|
|
bool SetThumbnailClip(const gfx::Rect& region);
|
|
bool SetThumbnailToolTip(const std::string& tooltip);
|
|
void SetAppDetails(const gin_helper::Dictionary& options);
|
|
bool IsSnapped() const;
|
|
void SetAccentColor(gin::Arguments* args);
|
|
v8::Local<v8::Value> GetAccentColor() const;
|
|
#endif
|
|
|
|
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
|
|
void SetTitleBarOverlay(const gin_helper::Dictionary& options,
|
|
gin::Arguments* args);
|
|
#endif
|
|
[[nodiscard]] constexpr int32_t GetID() const { return weak_map_id(); }
|
|
|
|
private:
|
|
// Helpers.
|
|
|
|
// Remove this window from parent window's |child_windows_|.
|
|
void RemoveFromParentChildWindows();
|
|
|
|
template <typename... Args>
|
|
void EmitEventSoon(std::string_view eventName) {
|
|
content::GetUIThreadTaskRunner({})->PostTask(
|
|
FROM_HERE,
|
|
base::BindOnce(base::IgnoreResult(&BaseWindow::Emit<Args...>),
|
|
weak_factory_.GetWeakPtr(), eventName));
|
|
}
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
typedef std::map<UINT, MessageCallback> MessageCallbackMap;
|
|
MessageCallbackMap messages_callback_map_;
|
|
#endif
|
|
|
|
v8::Global<v8::Value> content_view_;
|
|
v8::Global<v8::Value> menu_;
|
|
v8::Global<v8::Value> parent_window_;
|
|
KeyWeakMap<int> child_windows_;
|
|
|
|
std::unique_ptr<NativeWindow> window_;
|
|
|
|
// Reference to JS wrapper to prevent garbage collection.
|
|
v8::Global<v8::Value> self_ref_;
|
|
|
|
base::WeakPtrFactory<BaseWindow> weak_factory_{this};
|
|
};
|
|
|
|
} // namespace api
|
|
} // namespace electron
|
|
|
|
#endif // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_BASE_WINDOW_H_
|