7e59d784a0
* chore: bump chromium in DEPS to 101.0.4911.0
* chore: bump chromium in DEPS to 101.0.4913.0
* chore: bump chromium in DEPS to 101.0.4915.0
* chore: bump chromium in DEPS to 101.0.4917.0
* chore: bump chromium in DEPS to 101.0.4919.0
* chore: bump chromium in DEPS to 101.0.4921.0
* chore: bump chromium in DEPS to 101.0.4923.0
* chore: bump chromium in DEPS to 101.0.4925.0
* chore: bump chromium in DEPS to 101.0.4927.0
* chore: bump chromium in DEPS to 101.0.4929.0
* chore: update patches
* chore: bump chromium in DEPS to 101.0.4931.0
* chore: update patches
* 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T>
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3475388
Actual fixes in 1824792: Migrate DisplayClient to the new Mojo types | https://chromium-review.googlesource.com/c/chromium/src/+/1824792
* 3503874: Remove base::size(), base::empty(), and base::data().
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3503874
* chore: reconcile patches with main rebase
* chore: bump chromium in DEPS to 101.0.4933.0
* chore: update patches
* 3329593: [Fenced Frame] Ensure to support external protocols in a fenced frame
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3329593
* 3503874: Remove base::size(), base::empty(), and base::data().
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3503874
* 3446451: Use forward decl of ImageSkiaRep in //ui/gfx/image/image_skia.h
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3446451
* 3499818: partition_alloc: Rename AllocFlags to AllocWithFlags
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3499818
* chore: bump chromium in DEPS to 101.0.4935.0
* chore: update patches
* 3463286: partition_alloc: Move PartitionAlloc into the own namespaces (15 of N)
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3463286
* 3506590: Reland "Support ChromeOS external protocol dialog for Fenced Frame navigations"
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3506590
* 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T>
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3475388
Actual fixes in 1880987: Convert URLLoaderReqeust from //content to new Mojo types | https://chromium-review.googlesource.com/c/chromium/src/+/1880987 The change in the roll started causing the legacy types to fail
* chore: missing SkRegion include
* 3499600: Introduce blink::WebCssOrigin
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3499600
* fixup!: 3503874: Remove base::size(), base::empty(), and base::data().
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3503874
* chore: bump chromium in DEPS to 101.0.4937.0
* chore: update patches
* 3500826: [locales] Refactor locales for ios
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3500826
* 3509531: Make some public Blink media files private
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3509531
* 3497377: bluetooth: Add BluetoothDevice.forget()
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3497377
* chore: bump chromium in DEPS to 101.0.4939.0
* chore: bump chromium in DEPS to 101.0.4941.0
* 3514804: Deprecate all existing uses of mojo_base.mojom.{Dictionary,List}Value.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3514804
* 3502592: Delete PPAPI init/shutdown code in //pdf.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3502592
* chore: update patches
* fixup! 3502592: Delete PPAPI init/shutdown code in //pdf.
* chore: bump chromium in DEPS to 101.0.4943.0
* chore: fix lint, remove unneeded headers
* fixup! 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T>
* update mojo calls in offscreen patch
* update hunspell filenames
* chore: bump chromium in DEPS to 101.0.4945.0
* chore: update patches
* fix offscreen patch again
* chore: bump chromium in DEPS to 101.0.4947.0
* chore: update patches
* chore: bump chromium in DEPS to 101.0.4949.0
* support unseasoned pdf
* update patches
* chore: update patches
* chore: [IWYU] include missing skia headers
* chore: bump chromium in DEPS to 101.0.4951.0
* chore: update patches
* 3457645: media: Remove IsKeySystemsUpdateNeeded()
https://chromium-review.googlesource.com/c/chromium/src/+/3457645
* chore: bump chromium in DEPS to 102.0.4952.2
* chore: update patches
* 3488672: Add documentId as a parameter in tabs.connect() and tabs.sendMessage().
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3488672
* 3508375: Fix an issue dangerous dialog is not shown for some apk download
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3508375
* chore: bump chromium in DEPS to 102.0.4953.0
* chore: update patches
* 3510189: Harden up drag and drop support across same-process boundaries.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3510189
* 3526815: Remove hardcoded colors from chrome/browser/ui/views/overlay/.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3526815
* chore: bump chromium in DEPS to 102.0.4955.0
* build: add af and ur locale to manifests
3498914 [locales] Add af and ur to desktop
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3498914
* fixup! build: add af and ur locale to manifests
* chore: bump chromium in DEPS to 102.0.4957.0
* 3529090: gin: set JS flags before v8 initialization
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3529090
chore: fix code shear in chromium/gin_enable_disable_v8_platform.patch
* chore: update patches
* 3536433: [network] Rename data_path and http_cache_path from _path to _directory.
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3536433
* 3111565: Relocated Page.printToPDF implementation to //components
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3111565
refactor: inject E args to PrintRequestedPages() and ScriptedPrintCallback
TODO: currently passes a placeholder for job_settings. We have other
code paths that inject settings from electron_api_web_contents.cc.
Should those be injected here as well? (CC @codebytere)
* fixup! 3111565: Relocated Page.printToPDF implementation to //components
* fixup! 3111565: Relocated Page.printToPDF implementation to //components
* 3520025: Make "libcxx_abi_unstable" not a gn arg
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3520025
build: since it is no longer a gn arg, patch it in
* chore: change usages of std::vector with const elements (#33373)
* chore: bump chromium in DEPS to 102.0.4959.0
* chore: update patches
* build: iwyu base/threading/platform_thread.h
* 3525774: Add GPSForCurrentDocument() into PermissionControllerDelegate.
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3525774
refactor: copy upstream impl of GetPermissionStatusForCurrentDocument into +ElectronPermissionManager
* use gclient_gn_args_from instead of hand-copying
* checkout mac on mac
* chore: update patches
* Revert "checkout mac on mac"
This reverts commit fe9ccf49ec6139868ccf2272c2016cefa3f32769.
* fixup! 3525774: Add GPSForCurrentDocument() into PermissionControllerDelegate.
* fixup! 3457645: media: Remove IsKeySystemsUpdateNeeded()
add nogncheck
* fix: set .eslintrc.json to root to avoid cascade to chromium eslintrc
* Xref: 6dfdf79b8c
Xref: https://reviews.llvm.org/D101458
Upstream added a CMakeLists.txt in an include dir ¯\_(ツ)_/¯ and
so it must be enumerated in filenames.libcxxabi.gni
* 3511268: Remove unused headers from cxx17_backports.h
https://chromium-review.googlesource.com/c/chromium/src/+/3511268
use std::size instead of base::size
* iwyu: SkPaint
3488428: [includes] Fix transitive includes of SkImageEncoder
* chore: [IWYU] include missing skia headers
* fixup! 3511268: Remove unused headers from cxx17_backports.h
* chore: bump chromium in DEPS to 102.0.4961.0
* chore: update patches
* fixup! 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T>
chore: remove unused #include
* fixup! 3510189: Harden up drag and drop support across same-process boundaries. | https://chromium-review.googlesource.com/c/chromium/src/+/3510189
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: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: VerteDinde <keeleymhammond@gmail.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
188 lines
7 KiB
Text
188 lines
7 KiB
Text
// Copyright (c) 2015 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/common/api/electron_api_native_image.h"
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#import <Cocoa/Cocoa.h>
|
|
#import <QuickLook/QuickLook.h>
|
|
#import <QuickLookThumbnailing/QuickLookThumbnailing.h>
|
|
|
|
#include "base/mac/foundation_util.h"
|
|
#include "base/mac/scoped_nsobject.h"
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "gin/arguments.h"
|
|
#include "shell/common/gin_converters/image_converter.h"
|
|
#include "shell/common/gin_helper/promise.h"
|
|
#include "ui/gfx/color_utils.h"
|
|
#include "ui/gfx/geometry/size.h"
|
|
#include "ui/gfx/image/image_skia.h"
|
|
#include "ui/gfx/image/image_skia_operations.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace api {
|
|
|
|
NSData* bufferFromNSImage(NSImage* image) {
|
|
CGImageRef ref = [image CGImageForProposedRect:nil context:nil hints:nil];
|
|
NSBitmapImageRep* rep = [[NSBitmapImageRep alloc] initWithCGImage:ref];
|
|
[rep setSize:[image size]];
|
|
return [rep representationUsingType:NSPNGFileType
|
|
properties:[[NSDictionary alloc] init]];
|
|
}
|
|
|
|
double safeShift(double in, double def) {
|
|
if (in >= 0 || in <= 1 || in == def)
|
|
return in;
|
|
return def;
|
|
}
|
|
|
|
// static
|
|
v8::Local<v8::Promise> NativeImage::CreateThumbnailFromPath(
|
|
v8::Isolate* isolate,
|
|
const base::FilePath& path,
|
|
const gfx::Size& size) {
|
|
gin_helper::Promise<gfx::Image> promise(isolate);
|
|
v8::Local<v8::Promise> handle = promise.GetHandle();
|
|
|
|
if (size.IsEmpty()) {
|
|
promise.RejectWithErrorMessage("size must not be empty");
|
|
return handle;
|
|
}
|
|
|
|
CGSize cg_size = size.ToCGSize();
|
|
|
|
if (@available(macOS 10.15, *)) {
|
|
NSURL* nsurl = base::mac::FilePathToNSURL(path);
|
|
|
|
// We need to explicitly check if the user has passed an invalid path
|
|
// because QLThumbnailGenerationRequest will generate a stock file icon
|
|
// and pass silently if we do not.
|
|
if (![[NSFileManager defaultManager] fileExistsAtPath:[nsurl path]]) {
|
|
promise.RejectWithErrorMessage(
|
|
"unable to retrieve thumbnail preview image for the given path");
|
|
return handle;
|
|
}
|
|
|
|
NSScreen* screen = [[NSScreen screens] firstObject];
|
|
base::scoped_nsobject<QLThumbnailGenerationRequest> request(
|
|
[[QLThumbnailGenerationRequest alloc]
|
|
initWithFileAtURL:nsurl
|
|
size:cg_size
|
|
scale:[screen backingScaleFactor]
|
|
representationTypes:
|
|
QLThumbnailGenerationRequestRepresentationTypeAll]);
|
|
__block gin_helper::Promise<gfx::Image> p = std::move(promise);
|
|
[[QLThumbnailGenerator sharedGenerator]
|
|
generateBestRepresentationForRequest:request
|
|
completionHandler:^(
|
|
QLThumbnailRepresentation* thumbnail,
|
|
NSError* error) {
|
|
if (error || !thumbnail) {
|
|
std::string err_msg(
|
|
[error.localizedDescription UTF8String]);
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
p.RejectWithErrorMessage(
|
|
"unable to retrieve thumbnail preview "
|
|
"image for the given path: " +
|
|
err_msg);
|
|
});
|
|
} else {
|
|
NSImage* result = [[[NSImage alloc]
|
|
initWithCGImage:[thumbnail CGImage]
|
|
size:cg_size] autorelease];
|
|
gfx::Image image(result);
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
p.Resolve(image);
|
|
});
|
|
}
|
|
}];
|
|
} else {
|
|
base::ScopedCFTypeRef<CFURLRef> cfurl = base::mac::FilePathToCFURL(path);
|
|
base::ScopedCFTypeRef<QLThumbnailRef> ql_thumbnail(
|
|
QLThumbnailCreate(kCFAllocatorDefault, cfurl, cg_size, NULL));
|
|
__block gin_helper::Promise<gfx::Image> p = std::move(promise);
|
|
// Do not block the main thread waiting for quicklook to generate the
|
|
// thumbnail.
|
|
QLThumbnailDispatchAsync(
|
|
ql_thumbnail,
|
|
dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, /*flags*/ 0), ^{
|
|
base::ScopedCFTypeRef<CGImageRef> cg_thumbnail(
|
|
QLThumbnailCopyImage(ql_thumbnail));
|
|
if (cg_thumbnail) {
|
|
NSImage* result =
|
|
[[[NSImage alloc] initWithCGImage:cg_thumbnail
|
|
size:cg_size] autorelease];
|
|
gfx::Image thumbnail(result);
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
p.Resolve(thumbnail);
|
|
});
|
|
} else {
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
p.RejectWithErrorMessage("unable to retrieve thumbnail preview "
|
|
"image for the given path");
|
|
});
|
|
}
|
|
});
|
|
}
|
|
|
|
return handle;
|
|
}
|
|
|
|
gin::Handle<NativeImage> NativeImage::CreateFromNamedImage(gin::Arguments* args,
|
|
std::string name) {
|
|
@autoreleasepool {
|
|
std::vector<double> hsl_shift;
|
|
|
|
// The string representations of NSImageNames don't match the strings
|
|
// themselves; they instead follow the following pattern:
|
|
// * NSImageNameActionTemplate -> "NSActionTemplate"
|
|
// * NSImageNameMultipleDocuments -> "NSMultipleDocuments"
|
|
// To account for this, we strip out "ImageName" from the passed string.
|
|
std::string to_remove("ImageName");
|
|
size_t pos = name.find(to_remove);
|
|
if (pos != std::string::npos) {
|
|
name.erase(pos, to_remove.length());
|
|
}
|
|
|
|
NSImage* image = [NSImage imageNamed:base::SysUTF8ToNSString(name)];
|
|
|
|
if (!image.valid) {
|
|
return CreateEmpty(args->isolate());
|
|
}
|
|
|
|
NSData* png_data = bufferFromNSImage(image);
|
|
|
|
if (args->GetNext(&hsl_shift) && hsl_shift.size() == 3) {
|
|
gfx::Image gfx_image = gfx::Image::CreateFrom1xPNGBytes(
|
|
reinterpret_cast<const unsigned char*>((char*)[png_data bytes]),
|
|
[png_data length]);
|
|
color_utils::HSL shift = {safeShift(hsl_shift[0], -1),
|
|
safeShift(hsl_shift[1], 0.5),
|
|
safeShift(hsl_shift[2], 0.5)};
|
|
png_data = bufferFromNSImage(
|
|
gfx::Image(gfx::ImageSkiaOperations::CreateHSLShiftedImage(
|
|
gfx_image.AsImageSkia(), shift))
|
|
.AsNSImage());
|
|
}
|
|
|
|
return CreateFromPNG(args->isolate(), (char*)[png_data bytes],
|
|
[png_data length]);
|
|
}
|
|
}
|
|
|
|
void NativeImage::SetTemplateImage(bool setAsTemplate) {
|
|
[image_.AsNSImage() setTemplate:setAsTemplate];
|
|
}
|
|
|
|
bool NativeImage::IsTemplateImage() {
|
|
return [image_.AsNSImage() isTemplate];
|
|
}
|
|
|
|
} // namespace api
|
|
|
|
} // namespace electron
|