mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to a264339194bfa02f5ecb3b8cba449 (master) (#27111)

Browse source 
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
Electron Bot 2021-01-12 15:31:23 -08:00 • committed by GitHub
parent 1cd72425aa
commit adf0a73543
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
86 changed files with 503 additions and 460 deletions
Download patch file Download diff file Expand all files Collapse all files

28
shell/common/api/electron_api_native_image.cc
View file

@ -109,8 +109,11 @@ base::win::ScopedHICON ReadICOFromPath(int size, const base::FilePath& path) {
NativeImage::NativeImage(v8::Isolate* isolate, const gfx::Image& image)
: image_(image), isolate_(isolate) {
if (image_.HasRepresentation(gfx::Image::kImageRepSkia)) {
isolate_->AdjustAmountOfExternalAllocatedMemory(
image_.ToImageSkia()->bitmap()->computeByteSize());
auto* const image_skia = image_.ToImageSkia();
if (!image_skia->isNull()) {
isolate_->AdjustAmountOfExternalAllocatedMemory(
image_skia->bitmap()->computeByteSize());
}
}
}
@ -122,16 +125,21 @@ NativeImage::NativeImage(v8::Isolate* isolate, const base::FilePath& hicon_path)
electron::util::ReadImageSkiaFromICO(&image_skia, GetHICON(256));
image_ = gfx::Image(image_skia);
if (image_.HasRepresentation(gfx::Image::kImageRepSkia)) {
isolate_->AdjustAmountOfExternalAllocatedMemory(
image_.ToImageSkia()->bitmap()->computeByteSize());
if (!image_skia.isNull()) {
isolate_->AdjustAmountOfExternalAllocatedMemory(
image_.ToImageSkia()->bitmap()->computeByteSize());
}
}
}
#endif
NativeImage::~NativeImage() {
if (image_.HasRepresentation(gfx::Image::kImageRepSkia)) {
isolate_->AdjustAmountOfExternalAllocatedMemory(-static_cast<int64_t>(
image_.ToImageSkia()->bitmap()->computeByteSize()));
auto* const image_skia = image_.ToImageSkia();
if (!image_skia->isNull()) {
isolate_->AdjustAmountOfExternalAllocatedMemory(
image_skia->bitmap()->computeByteSize());
}
}
}
@ -325,7 +333,9 @@ gin::Handle<NativeImage> NativeImage::Resize(gin::Arguments* args,
bool height_set = options.GetInteger("height", &height);
size.SetSize(width, height);
if (width_set && !height_set) {
if (width <= 0 && height <= 0) {
return CreateEmpty(args->isolate());
} else if (width_set && !height_set) {
// Scale height to preserve original aspect ratio
size.set_height(width);
size =
@ -500,8 +510,8 @@ gin::Handle<NativeImage> NativeImage::CreateFromBitmap(
bitmap.allocN32Pixels(width, height, false);
bitmap.writePixels({info, node::Buffer::Data(buffer), bitmap.rowBytes()});
gfx::ImageSkia image_skia;
image_skia.AddRepresentation(gfx::ImageSkiaRep(bitmap, scale_factor));
gfx::ImageSkia image_skia =
gfx::ImageSkia::CreateFromBitmap(bitmap, scale_factor);
return Create(thrower.isolate(), gfx::Image(image_skia));
}

5
shell/common/api/electron_api_native_image_win.cc
View file

@ -93,9 +93,8 @@ v8::Local<v8::Promise> NativeImage::CreateThumbnailFromPath(
base::win::ScopedHICON icon(CreateIconIndirect(&icon_info));
SkBitmap skbitmap = IconUtil::CreateSkBitmapFromHICON(icon.get());
gfx::ImageSkia image_skia;
image_skia.AddRepresentation(
gfx::ImageSkiaRep(skbitmap, 1.0 /*scale factor*/));
gfx::ImageSkia image_skia =
gfx::ImageSkia::CreateFromBitmap(skbitmap, 1.0 /*scale factor*/);
gfx::Image gfx_image = gfx::Image(image_skia);
promise.Resolve(gfx_image);
return handle;

16
shell/common/gin_converters/blink_converter.cc
View file

@ -325,21 +325,21 @@ bool Converter<blink::DeviceEmulationParams>::FromV8(
}
// static
v8::Local<v8::Value> Converter<blink::ContextMenuDataMediaType>::ToV8(
v8::Local<v8::Value> Converter<blink::mojom::ContextMenuDataMediaType>::ToV8(
v8::Isolate* isolate,
const blink::ContextMenuDataMediaType& in) {
const blink::mojom::ContextMenuDataMediaType& in) {
switch (in) {
case blink::ContextMenuDataMediaType::kImage:
case blink::mojom::ContextMenuDataMediaType::kImage:
return StringToV8(isolate, "image");
case blink::ContextMenuDataMediaType::kVideo:
case blink::mojom::ContextMenuDataMediaType::kVideo:
return StringToV8(isolate, "video");
case blink::ContextMenuDataMediaType::kAudio:
case blink::mojom::ContextMenuDataMediaType::kAudio:
return StringToV8(isolate, "audio");
case blink::ContextMenuDataMediaType::kCanvas:
case blink::mojom::ContextMenuDataMediaType::kCanvas:
return StringToV8(isolate, "canvas");
case blink::ContextMenuDataMediaType::kFile:
case blink::mojom::ContextMenuDataMediaType::kFile:
return StringToV8(isolate, "file");
case blink::ContextMenuDataMediaType::kPlugin:
case blink::mojom::ContextMenuDataMediaType::kPlugin:
return StringToV8(isolate, "plugin");
default:
return StringToV8(isolate, "none");

7
shell/common/gin_converters/blink_converter.h
View file

@ -67,9 +67,10 @@ struct Converter<blink::DeviceEmulationParams> {
};
template <>
struct Converter<blink::ContextMenuDataMediaType> {
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
const blink::ContextMenuDataMediaType& in);
struct Converter<blink::mojom::ContextMenuDataMediaType> {
static v8::Local<v8::Value> ToV8(
v8::Isolate* isolate,
const blink::mojom::ContextMenuDataMediaType& in);
};
template <>

2
shell/common/gin_converters/content_converter.cc
View file

@ -144,7 +144,7 @@ v8::Local<v8::Value> Converter<ContextMenuParamsWithWebContents>::ToV8(
dict.Set("mediaType", params.media_type);
dict.Set("mediaFlags", MediaFlagsToV8(isolate, params.media_flags));
bool has_image_contents =
(params.media_type == blink::ContextMenuDataMediaType::kImage) &&
(params.media_type == blink::mojom::ContextMenuDataMediaType::kImage) &&
params.has_image_contents;
dict.Set("hasImageContents", has_image_contents);
dict.Set("isEditable", params.is_editable);