ccd4531bfb
* chore: bump chromium in DEPS to 117.0.5846.0 * chore: update patches * 4628901: Bump the macOS deployment target to 10.15 https://chromium-review.googlesource.com/c/chromium/src/+/4628901 * 4593350: [Private Network Access] Trigger Permission Prompt https://chromium-review.googlesource.com/c/chromium/src/+/4593350 * 4631011: Remove unlaunched "InstallReplacementAndroidApp" Platform App APIs https://chromium-review.googlesource.com/c/chromium/src/+/4631011 * chore: disable API deprecation warnings in NSKeyedArchiver * chore: update libcxx filenames * chore: bump chromium in DEPS to 117.0.5848.2 * chore: update feat_add_set_theme_source_to_allow_apps_to.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4629743 No manual changes; patch succeeded with fuzz * chore: update process_singleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4605398 Trivial manual patch adjustments to account for code shear. * chore: remove electron::BrowserContext::GetMediaDeviceIDSalt() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4608130 upstream tldr: - content::BrowserContext::GetMediaDeviceIDSalt() - content::ContentBrowserClient::ArePersistentMediaDeviceIDsAllowed() + content::ContentBrowserClient::GetMediaDeviceIDSalt() This commit leaves ElectronBrowserContext::GetMediaDeviceIDSalt() in place (now non-virtual, non-override). It is now called by the new function ElectronBrowserClient::GetMediaDeviceIDSalt(). As a followup, we might want to consider using the new upstream media_device_salt::MediaDeviceSaltService and removing our electron::MediaDeviceIDSalt code. CC @MarshallOfSound for 2nd opinion since he has done the most work on MediaDeviceIDSalt and may have more context. * chore: fix iwyu breakage Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4629624 electron_browser_main_parts.cc uses ui::ColorProviderManager but didn't include it. Things worked anyway because we got it indirectly from content/public/browser/web_contents.h until 4629624. * chore: remove call to base::mac::IsAtLeastOS10_14 upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove obsolete API_AVAILABLE calls in IAP upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove obsolete API_AVAILABLE calls in electron_application_delegate upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove broken-before-macOS-10.15 patch in mas_avoid_usage_of_private_macos_apis.patch Upstream has bumped minimum to macOS 10.15 * chore: remove @available(macOS 10.14) check Upstream minimum requirement for macOS is now 10.15 * chore: update patches * chore: bump chromium in DEPS to 117.0.5850.0 * chore: update patches * chore: bump chromium in DEPS to 117.0.5852.0 * chore: update patches * Move two params from NetworkContextParams to NetworkContextFilePaths. https://chromium-review.googlesource.com/c/chromium/src/+/4615930 * WebUSB: Add exclusionFilters to USBRequestDeviceOptions https://chromium-review.googlesource.com/c/chromium/src/+/4614682 * Convert /chrome/browser/ui to use ARC https://chromium-review.googlesource.com/c/chromium/src/+/4615920 * fixup! Bump the macOS deployment target to 10.15 * fixup! Bump the macOS deployment target to 10.15 * chore: update libcxx files * win: Remove 10Glass from Windows10Glass function and var names https://chromium-review.googlesource.com/c/chromium/src/+/4641314 * chore: revert 392e5f43 from chromium * Add an ExecutionContext to ScriptState https://chromium-review.googlesource.com/c/chromium/src/+/4609446 * fixup! Add an ExecutionContext to ScriptState * chore: fix header * Revert "chore: revert 392e5f43 from chromium" This reverts commit b7f782943e4ce83cae8cd35780d8d3618cf0772c. * fix: return correct min/max sizes in WinFrameView * fixup! Revert chore: revert 392e5f43 from chromium * fixup! Add an ExecutionContext to ScriptState * Revert "fixup! Revert chore: revert 392e5f43 from chromium" This reverts commit 7e2c7281abfc4f309255339fdba073d90a9ae3eb. * Revert "fix: return correct min/max sizes in WinFrameView" This reverts commit 3f418b1ab5155686730e087ae6cabe4a21b4bb61. * Revert "Revert "chore: revert 392e5f43 from chromium"" This reverts commit 56296d8b7c434147e032e3c3b08c0e371b6c27ba. --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
155 lines
5.6 KiB
Text
155 lines
5.6 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::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:NSBitmapImageFileTypePNG
|
|
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();
|
|
|
|
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);
|
|
});
|
|
}
|
|
}];
|
|
|
|
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 electron::api
|