89117fdd99
* chore: bump chromium in DEPS to 118.0.5951.0 * chore: update printing.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4727894 No logic changes, but patch needed to be manually re-applied due to upstream code shear * chore: update port_autofill_colors_to_the_color_pipeline.patch No manual changes; patch applied with fuzz * chore: update patches * chore: bump chromium in DEPS to 118.0.5953.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5955.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5957.0 * chore: update patches * chore: include path of native_web_keyboard_event.h Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689 * chore: remove reference to eextensions/browser/notification-types.h Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4771627 * chore: update references to renamed upstream field NativeWebKeyboardEvent.skip_if_unhandled (formerly known as skip_in_browser Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689 Need a second pair of eyes on this commit. In particular the reference in content_converter.cc, skipInBrowser, seems to not be set or documented anywhere? Is this unused/vestigal code? * chore: sync signature of ElectronExtensionsBrowserClient::IsValidContext() to upstream change Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4784198 * chore: add auto_pip_setting_helper.[cc,h] to chromium_src build Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4688277 Exiting upstream code used by chromium_src now depends on this new upstream class * chore: bump chromium in DEPS to 118.0.5959.0 * chore: update add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: add_maximized_parameter_to_linuxui_getwindowframeprovider.patch manually adjust patch to minor upstream chagnes * chore: update patches * chore: bump chromium in DEPS to 118.0.5961.0 * chore: bump chromium in DEPS to 118.0.5963.0 * chore: update patches * 4780994: Rename various base files to "apple" since iOS uses them too https://chromium-review.googlesource.com/c/chromium/src/+/4780994 * Many files moved from `mac` -> `apple` This commit follows a handful of CLs that simply rename files/symbols to change `mac` to `apple` to signify their use across both macOS and iOS: - 4784010: Move scoped_nsautorelease_pool to base/apple, leave a forwarding header - 4790744: Move foundation_util to base/apple, leave a forwarding header - 4790741: Move scoped_cftypreref to base/apple, leave a forwarding header - 4787627: Move and rename macOS+iOS base/ files in PA to "apple" - 4780399: Move OSStatus logging to base/apple - 4787387: Remove forwarding headers - 4781113: Rename message_pump_mac to "apple" because iOS uses it too * fixup minor patch update error A function param got dropped from this patch somewhere earlier * chore: bump chromium in DEPS to 118.0.5965.2 * chore: update patches * 4799213: Move ScopedTypeRef and ScopedCFTypeRef into base:🍎: https://chromium-review.googlesource.com/c/chromium/src/+/4799213 * Fix removed include to BrowserContext In crrev.com/c/4767962 an include to BrowserContext was removed, which was necessary for compilation. This broke only for us because "chrome/browser/profiles/profile.h" includes that class, but we remove all references to profiles. * chore: bump chromium in DEPS to 118.0.5967.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5969.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5971.0 * chore: bump chromium in DEPS to 118.0.5973.0 * chore: update patches * 4772121: [OOPIF PDF] Replace PDFWebContentsHelper with PDFDocumentHelper https://chromium-review.googlesource.com/c/chromium/src/+/4772121 * 4811164: [Extensions] Do some cleanup in ChromeManagementAPIDelegate. https://chromium-review.googlesource.com/c/chromium/src/+/4811164 * 4809488: Remove duplicate dnd functionality between Web and Renderer prefs https://chromium-review.googlesource.com/c/chromium/src/+/4809488 Given that this is no longer an option of web preferences, we should consider deprecating this option and then removing it. * chore: bump chromium in DEPS to 118.0.5975.0 * chore: update patches * fixup! chore: add auto_pip_settings_helper.{cc|h} to chromium_src build * Reland "[windows] Remove RegKey::DeleteEmptyKey" Refs https://chromium-review.googlesource.com/c/chromium/src/+/4813255 * Ensure StrCat means StrCat Refs https://chromium-review.googlesource.com/c/chromium/src/+/1117180 * fixup! Remove RegKey::DeleteEmptyKey * Consistently reject large p and large q in DH Refs https://boringssl-review.googlesource.com/c/boringssl/+/62226 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com>
152 lines
5.5 KiB
Text
152 lines
5.5 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/apple/foundation_util.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::apple::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];
|
|
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];
|
|
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
|