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>
152 lines
4.6 KiB
C++
152 lines
4.6 KiB
C++
// Copyright (c) 2015 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef ELECTRON_SHELL_COMMON_API_ELECTRON_API_NATIVE_IMAGE_H_
|
|
#define ELECTRON_SHELL_COMMON_API_ELECTRON_API_NATIVE_IMAGE_H_
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "base/containers/flat_map.h"
|
|
#include "base/containers/span.h"
|
|
#include "base/memory/raw_ptr.h"
|
|
#include "base/values.h"
|
|
#include "shell/common/gin_helper/wrappable.h"
|
|
#include "ui/gfx/image/image.h"
|
|
#include "ui/gfx/image/image_skia_rep.h"
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
#include "base/files/file_path.h"
|
|
#include "base/win/scoped_gdi_object.h"
|
|
#endif
|
|
|
|
class GURL;
|
|
|
|
namespace base {
|
|
class FilePath;
|
|
} // namespace base
|
|
|
|
namespace gfx {
|
|
class Rect;
|
|
class Size;
|
|
} // namespace gfx
|
|
|
|
namespace gin {
|
|
class Arguments;
|
|
} // namespace gin
|
|
|
|
namespace gin_helper {
|
|
class Dictionary;
|
|
class ErrorThrower;
|
|
template <typename T>
|
|
class Handle;
|
|
} // namespace gin_helper
|
|
|
|
namespace electron::api {
|
|
|
|
class NativeImage final : public gin_helper::DeprecatedWrappable<NativeImage> {
|
|
public:
|
|
NativeImage(v8::Isolate* isolate, const gfx::Image& image);
|
|
#if BUILDFLAG(IS_WIN)
|
|
NativeImage(v8::Isolate* isolate, const base::FilePath& hicon_path);
|
|
#endif
|
|
~NativeImage() override;
|
|
|
|
// disable copy
|
|
NativeImage(const NativeImage&) = delete;
|
|
NativeImage& operator=(const NativeImage&) = delete;
|
|
|
|
static gin_helper::Handle<NativeImage> CreateEmpty(v8::Isolate* isolate);
|
|
static gin_helper::Handle<NativeImage> Create(v8::Isolate* isolate,
|
|
const gfx::Image& image);
|
|
static gin_helper::Handle<NativeImage> CreateFromPNG(
|
|
v8::Isolate* isolate,
|
|
base::span<const uint8_t> data);
|
|
static gin_helper::Handle<NativeImage> CreateFromJPEG(
|
|
v8::Isolate* isolate,
|
|
base::span<const uint8_t> data);
|
|
static gin_helper::Handle<NativeImage> CreateFromPath(
|
|
v8::Isolate* isolate,
|
|
const base::FilePath& path);
|
|
static gin_helper::Handle<NativeImage> CreateFromBitmap(
|
|
gin_helper::ErrorThrower thrower,
|
|
v8::Local<v8::Value> buffer,
|
|
const gin_helper::Dictionary& options);
|
|
static gin_helper::Handle<NativeImage> CreateFromBuffer(
|
|
gin_helper::ErrorThrower thrower,
|
|
v8::Local<v8::Value> buffer,
|
|
gin::Arguments* args);
|
|
static gin_helper::Handle<NativeImage> CreateFromDataURL(v8::Isolate* isolate,
|
|
const GURL& url);
|
|
static gin_helper::Handle<NativeImage> CreateFromNamedImage(
|
|
gin::Arguments* args,
|
|
std::string name);
|
|
#if !BUILDFLAG(IS_LINUX)
|
|
static v8::Local<v8::Promise> CreateThumbnailFromPath(
|
|
v8::Isolate* isolate,
|
|
const base::FilePath& path,
|
|
const gfx::Size& size);
|
|
#endif
|
|
|
|
enum class OnConvertError { kThrow, kWarn };
|
|
|
|
static bool TryConvertNativeImage(
|
|
v8::Isolate* isolate,
|
|
v8::Local<v8::Value> image,
|
|
NativeImage** native_image,
|
|
OnConvertError on_error = OnConvertError::kThrow);
|
|
|
|
// gin_helper::Wrappable
|
|
static gin::DeprecatedWrapperInfo kWrapperInfo;
|
|
gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
|
|
v8::Isolate* isolate) override;
|
|
const char* GetTypeName() override;
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
HICON GetHICON(int size);
|
|
#endif
|
|
|
|
const gfx::Image& image() const { return image_; }
|
|
|
|
private:
|
|
v8::Local<v8::Value> ToPNG(gin::Arguments* args);
|
|
v8::Local<v8::Value> ToJPEG(v8::Isolate* isolate, int quality);
|
|
v8::Local<v8::Value> ToBitmap(gin::Arguments* args);
|
|
std::vector<float> GetScaleFactors();
|
|
v8::Local<v8::Value> GetBitmap(gin::Arguments* args);
|
|
v8::Local<v8::Value> GetNativeHandle(gin_helper::ErrorThrower thrower);
|
|
gin_helper::Handle<NativeImage> Resize(gin::Arguments* args,
|
|
base::DictValue options);
|
|
gin_helper::Handle<NativeImage> Crop(v8::Isolate* isolate,
|
|
const gfx::Rect& rect);
|
|
std::string ToDataURL(gin::Arguments* args);
|
|
bool IsEmpty();
|
|
gfx::Size GetSize(const std::optional<float> scale_factor);
|
|
float GetAspectRatio(const std::optional<float> scale_factor);
|
|
void AddRepresentation(const gin_helper::Dictionary& options);
|
|
|
|
void UpdateExternalAllocatedMemoryUsage();
|
|
|
|
// Mark the image as template image.
|
|
void SetTemplateImage(bool setAsTemplate);
|
|
// Determine if the image is a template image.
|
|
bool IsTemplateImage();
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
base::FilePath hicon_path_;
|
|
|
|
// size -> hicon
|
|
base::flat_map<int, base::win::ScopedGDIObject<HICON>> hicons_;
|
|
#endif
|
|
|
|
gfx::Image image_;
|
|
|
|
raw_ptr<v8::Isolate> isolate_;
|
|
int64_t memory_usage_ = 0;
|
|
};
|
|
|
|
} // namespace electron::api
|
|
|
|
#endif // ELECTRON_SHELL_COMMON_API_ELECTRON_API_NATIVE_IMAGE_H_
|