87c183df6a
* chore: bump chromium in DEPS to 109.0.5386.0 * chore: bump chromium in DEPS to 109.0.5388.0 * chore: bump chromium in DEPS to 109.0.5390.0 * chore: bump chromium in DEPS to 109.0.5392.0 * chore: bump chromium in DEPS to 109.0.5394.0 * chore: bump chromium in DEPS to 109.0.5396.0 * chore: bump chromium in DEPS to 109.0.5398.0 * chore: bump chromium in DEPS to 109.0.5400.0 * chore: update galactus * chore: bump chromium in DEPS to 109.0.5402.0 * chore: bump chromium in DEPS to 109.0.5403.0 * chore: bump chromium in DEPS to 109.0.5406.0 * chore: update patches * 4004247: Delete unused DocumentWebContentsDelegate Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4004247 * chore: bump chromium in DEPS to 109.0.5408.1 * chore: update patches * 3949284: Support pkey debug mode without pkey 0 access Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3949284 * chore: bump chromium in DEPS to 109.0.5410.0 * chore: update patches * 4000944: [Extensions] Create an API directory in //chrome/renderer/extensions Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4000944 * 3988524: Remove DocumentOverlayWindowViews | https://chromium-review.googlesource.com/c/chromium/src/+/3988524 Co-authored-by: George Xu <33054982+georgexu99@users.noreply.github.com> * chore: bump chromium in DEPS to 109.0.5412.0 * chore: update patches * 3984022: Add AddChildWindowToBrowser to DisplayClient mojo interface Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3984022 * 3957079: Delete the CryptoToken component extension and internal API Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3957079 * 4004421: Migreate ScopedAllowIO to ScopedAllowBlocking Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4004421 Co-authored-by: George Xu <georgexu99@users.noreply.github.com> * chore: bump chromium in DEPS to 109.0.5414.0 * chore: update patches * 4016180: Split PPAPI Mojo interfaces out of RenderFrameHostImpl. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4016180 * 3970838: [MPArch] Convert HostZoomMap and ZoomController off of RenderViewHost ids Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3970838 * 3997795: Don't add Chromium as a login item Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3997795 * 3993482: Remove RefCountedString::TakeString Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3993482 * 3990749: Allow forward-declared sources in base::ScopedObservation<> Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3990749 * fixup! 3957079: Delete the CryptoToken component extension and internal API * chore: bump chromium in DEPS to 110.0.5415.0 * 3883790: Move devtools_frame_token to the RenderFrameHost, to preserve RFH identity across MPArch activations. https://chromium-review.googlesource.com/c/chromium/src/+/3883790 * 4022205: Move license tooling into //tools/licenses https://chromium-review.googlesource.com/c/chromium/src/+/4022205 * chore: fixup patch indices * fixup! 3957079: Delete the CryptoToken component extension and internal API * 4008687: Finish ScopedAllowIO migration https://chromium-review.googlesource.com/c/chromium/src/+/4008687 * 3991548: Move WindowButtonOrderObserver and WindowFrameAction to LinuxUi https://chromium-review.googlesource.com/c/chromium/src/+/3991548 * fixup! 3984022: Add AddChildWindowToBrowser to DisplayClient mojo interface * 4016595: Migrate non-default ScopedObservation<> instantiations to ScopedObservationTraits<> in chrome/browser/ https://chromium-review.googlesource.com/c/chromium/src/+/4016595 * 4000481: Rename :chromedriver to :chromedriver_server Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4000481 * 4008687: Finish ScopedAllowIO migration https://chromium-review.googlesource.com/c/chromium/src/+/4008687 * 3988524: Remove DocumentOverlayWindowViews https://chromium-review.googlesource.com/c/chromium/src/+/3988524 * fixup! 3997795: Don't add Chromium as a login item * chore: fixup patches * 3996872: Plumb input event task runner to EventFactoryEvdev https://chromium-review.googlesource.com/c/chromium/src/+/3996872 * 4014994: Enable SiteIsolationForGuests by default. https://chromium-review.googlesource.com/c/chromium/src/+/4014994 * chore: adopt new thread restrictions api for //electron (#36357) chore: add thread blocking api * fixup! 4014994: Enable SiteIsolationForGuests by default. * pull parent HWND for dialogs on ui thread * chore: set parent_window in MessageBoxSettings * chore: remove redundant patch * chore: revert accidental deletion * chore: update patches Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <sattard@salesforce.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: George Xu <33054982+georgexu99@users.noreply.github.com> Co-authored-by: George Xu <georgexu99@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Robo <hop2deep@gmail.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
165 lines
5.4 KiB
C++
165 lines
5.4 KiB
C++
// Copyright (c) 2019 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include <string>
|
|
|
|
#include "base/files/file_path.h"
|
|
#include "base/files/file_util.h"
|
|
#include "base/strings/pattern.h"
|
|
#include "base/strings/string_util.h"
|
|
#include "net/base/data_url.h"
|
|
#include "shell/common/asar/asar_util.h"
|
|
#include "shell/common/node_includes.h"
|
|
#include "shell/common/skia_util.h"
|
|
#include "shell/common/thread_restrictions.h"
|
|
#include "third_party/skia/include/core/SkBitmap.h"
|
|
#include "third_party/skia/include/core/SkImageInfo.h"
|
|
#include "third_party/skia/include/core/SkPixelRef.h"
|
|
#include "ui/gfx/codec/jpeg_codec.h"
|
|
#include "ui/gfx/codec/png_codec.h"
|
|
#include "ui/gfx/geometry/size.h"
|
|
#include "ui/gfx/image/image_skia.h"
|
|
#include "ui/gfx/image/image_skia_operations.h"
|
|
#include "ui/gfx/image/image_skia_rep.h"
|
|
#include "ui/gfx/image/image_util.h"
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
#include "ui/gfx/icon_util.h"
|
|
#endif
|
|
|
|
namespace electron::util {
|
|
|
|
struct ScaleFactorPair {
|
|
const char* name;
|
|
float scale;
|
|
};
|
|
|
|
ScaleFactorPair kScaleFactorPairs[] = {
|
|
// The "@2x" is put as first one to make scale matching faster.
|
|
{"@2x", 2.0f}, {"@3x", 3.0f}, {"@1x", 1.0f}, {"@4x", 4.0f},
|
|
{"@5x", 5.0f}, {"@1.25x", 1.25f}, {"@1.33x", 1.33f}, {"@1.4x", 1.4f},
|
|
{"@1.5x", 1.5f}, {"@1.8x", 1.8f}, {"@2.5x", 2.5f},
|
|
};
|
|
|
|
float GetScaleFactorFromPath(const base::FilePath& path) {
|
|
std::string filename(path.BaseName().RemoveExtension().AsUTF8Unsafe());
|
|
|
|
// We don't try to convert string to float here because it is very very
|
|
// expensive.
|
|
for (const auto& kScaleFactorPair : kScaleFactorPairs) {
|
|
if (base::EndsWith(filename, kScaleFactorPair.name,
|
|
base::CompareCase::INSENSITIVE_ASCII))
|
|
return kScaleFactorPair.scale;
|
|
}
|
|
|
|
return 1.0f;
|
|
}
|
|
|
|
bool AddImageSkiaRepFromPNG(gfx::ImageSkia* image,
|
|
const unsigned char* data,
|
|
size_t size,
|
|
double scale_factor) {
|
|
SkBitmap bitmap;
|
|
if (!gfx::PNGCodec::Decode(data, size, &bitmap))
|
|
return false;
|
|
|
|
image->AddRepresentation(gfx::ImageSkiaRep(bitmap, scale_factor));
|
|
return true;
|
|
}
|
|
|
|
bool AddImageSkiaRepFromJPEG(gfx::ImageSkia* image,
|
|
const unsigned char* data,
|
|
size_t size,
|
|
double scale_factor) {
|
|
auto bitmap = gfx::JPEGCodec::Decode(data, size);
|
|
if (!bitmap)
|
|
return false;
|
|
|
|
// `JPEGCodec::Decode()` doesn't tell `SkBitmap` instance it creates
|
|
// that all of its pixels are opaque, that's why the bitmap gets
|
|
// an alpha type `kPremul_SkAlphaType` instead of `kOpaque_SkAlphaType`.
|
|
// Let's fix it here.
|
|
// TODO(alexeykuzmin): This workaround should be removed
|
|
// when the `JPEGCodec::Decode()` code is fixed.
|
|
// See https://github.com/electron/electron/issues/11294.
|
|
bitmap->setAlphaType(SkAlphaType::kOpaque_SkAlphaType);
|
|
|
|
image->AddRepresentation(gfx::ImageSkiaRep(*bitmap, scale_factor));
|
|
return true;
|
|
}
|
|
|
|
bool AddImageSkiaRepFromBuffer(gfx::ImageSkia* image,
|
|
const unsigned char* data,
|
|
size_t size,
|
|
int width,
|
|
int height,
|
|
double scale_factor) {
|
|
// Try PNG first.
|
|
if (AddImageSkiaRepFromPNG(image, data, size, scale_factor))
|
|
return true;
|
|
|
|
// Try JPEG second.
|
|
if (AddImageSkiaRepFromJPEG(image, data, size, scale_factor))
|
|
return true;
|
|
|
|
if (width == 0 || height == 0)
|
|
return false;
|
|
|
|
auto info = SkImageInfo::MakeN32(width, height, kPremul_SkAlphaType);
|
|
if (size < info.computeMinByteSize())
|
|
return false;
|
|
|
|
SkBitmap bitmap;
|
|
bitmap.allocN32Pixels(width, height, false);
|
|
bitmap.writePixels({info, data, bitmap.rowBytes()});
|
|
|
|
image->AddRepresentation(gfx::ImageSkiaRep(bitmap, scale_factor));
|
|
return true;
|
|
}
|
|
|
|
bool AddImageSkiaRepFromPath(gfx::ImageSkia* image,
|
|
const base::FilePath& path,
|
|
double scale_factor) {
|
|
std::string file_contents;
|
|
{
|
|
electron::ScopedAllowBlockingForElectron allow_blocking;
|
|
if (!asar::ReadFileToString(path, &file_contents))
|
|
return false;
|
|
}
|
|
|
|
const auto* data =
|
|
reinterpret_cast<const unsigned char*>(file_contents.data());
|
|
size_t size = file_contents.size();
|
|
|
|
return AddImageSkiaRepFromBuffer(image, data, size, 0, 0, scale_factor);
|
|
}
|
|
|
|
bool PopulateImageSkiaRepsFromPath(gfx::ImageSkia* image,
|
|
const base::FilePath& path) {
|
|
bool succeed = false;
|
|
std::string filename(path.BaseName().RemoveExtension().AsUTF8Unsafe());
|
|
if (base::MatchPattern(filename, "*@*x"))
|
|
// Don't search for other representations if the DPI has been specified.
|
|
return AddImageSkiaRepFromPath(image, path, GetScaleFactorFromPath(path));
|
|
else
|
|
succeed |= AddImageSkiaRepFromPath(image, path, 1.0f);
|
|
|
|
for (const ScaleFactorPair& pair : kScaleFactorPairs)
|
|
succeed |= AddImageSkiaRepFromPath(
|
|
image, path.InsertBeforeExtensionASCII(pair.name), pair.scale);
|
|
return succeed;
|
|
}
|
|
#if BUILDFLAG(IS_WIN)
|
|
bool ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon) {
|
|
// Convert the icon from the Windows specific HICON to gfx::ImageSkia.
|
|
SkBitmap bitmap = IconUtil::CreateSkBitmapFromHICON(icon);
|
|
if (bitmap.isNull())
|
|
return false;
|
|
|
|
image->AddRepresentation(gfx::ImageSkiaRep(bitmap, 1.0f));
|
|
return true;
|
|
}
|
|
#endif
|
|
|
|
} // namespace electron::util
|