github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump chromium to 104.0.5073.0 (20-x-y) (#34352)

Browse Source
This commit is contained in:
electron-roller[bot]
2022-06-02 10:54:37 +02:00
committed by GitHub
parent bba63609f2
commit 948949f83d
112 changed files with 663 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
shell/common/api/electron_api_native_image.cc
View File

@@ -271,9 +271,11 @@ std::string NativeImage::ToDataURL(gin::Arguments* args) {
image_.AsImageSkia().GetRepresentation(scale_factor).GetBitmap());
}
#if !defined(V8_SANDBOX)
void SkUnref(char* data, void* hint) {
reinterpret_cast<SkRefCnt*>(hint)->unref();
}
#endif
v8::Local<v8::Value> NativeImage::GetBitmap(gin::Arguments* args) {
float scale_factor = GetScaleFactorFromOptions(args);
@@ -283,11 +285,18 @@ v8::Local<v8::Value> NativeImage::GetBitmap(gin::Arguments* args) {
SkPixelRef* ref = bitmap.pixelRef();
if (!ref)
return node::Buffer::New(args->isolate(), 0).ToLocalChecked();
#if defined(V8_SANDBOX)
return node::Buffer::Copy(args->isolate(),
reinterpret_cast<char*>(ref->pixels()),
bitmap.computeByteSize())
.ToLocalChecked();
#else
ref->ref();
return node::Buffer::New(args->isolate(),
reinterpret_cast<char*>(ref->pixels()),
bitmap.computeByteSize(), &SkUnref, ref)
.ToLocalChecked();
#endif
}
v8::Local<v8::Value> NativeImage::GetNativeHandle(