chore: bump chromium to 131.0.6776.0 (main) (#44137)
* chore: bump chromium in DEPS to 131.0.6763.0 * chore: bump chromium in DEPS to 131.0.6764.0 * update patches * chore: bump chromium in DEPS to 131.0.6766.0 * chore: update patches * Use PathInfo in FileSystemAccess code Refs5872329
* Modernize image utilities. Refs5905226
* [DevTools] move feature flags to the devtools directory Refs5913878
* chore: bump chromium in DEPS to 131.0.6768.0 * chore: update patches * Remove experimental credshelper flags Refs4017a6c8b4
* Change gfx::[PNG|JPEG]Codec::Decode to return a SkBitmap Refs5917286
Refs5905621
* chore: script/gen-libc++-filenames.js * chore: bump chromium in DEPS to 131.0.6770.0 * chore: update patches * chore: bump chromium in DEPS to 131.0.6772.0 * chore: update patches * [UI] Add alias for mojo version of `MenuSourceType` Refs5803393
* Update Background Color for Task Manager Refresh Refs5875259
* chore: bump chromium in DEPS to 131.0.6774.0 * chore: bump chromium in DEPS to 131.0.6776.0 * chore: update patches * chore: update filenames.libcxx.gni * esm: remove --no-import-harmony-assertions https://github.com/nodejs/node/pull/54890 * 5507047: [import-attributes] Remove support for import assertions |5507047
* fixup: Change gfx::[PNG|JPEG]Codec::Decode to return a SkBitmap * chore: bump chromium in DEPS to 131.0.6778.0 * Revert "chore: bump chromium in DEPS to 131.0.6778.0" This reverts commit fb9092fc51700651aa4a245931f71ec1ca55a274. --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <nornagon@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
parent
72802c374b
commit
36b7cf341e
59 changed files with 395 additions and 325 deletions
|
@ -58,8 +58,8 @@ float GetScaleFactorFromPath(const base::FilePath& path) {
|
|||
bool AddImageSkiaRepFromPNG(gfx::ImageSkia* image,
|
||||
const base::span<const uint8_t> data,
|
||||
double scale_factor) {
|
||||
SkBitmap bitmap;
|
||||
if (!gfx::PNGCodec::Decode(data.data(), data.size(), &bitmap))
|
||||
SkBitmap bitmap = gfx::PNGCodec::Decode(data);
|
||||
if (bitmap.isNull())
|
||||
return false;
|
||||
|
||||
image->AddRepresentation(gfx::ImageSkiaRep(bitmap, scale_factor));
|
||||
|
@ -69,8 +69,8 @@ bool AddImageSkiaRepFromPNG(gfx::ImageSkia* image,
|
|||
bool AddImageSkiaRepFromJPEG(gfx::ImageSkia* image,
|
||||
const base::span<const uint8_t> data,
|
||||
double scale_factor) {
|
||||
auto bitmap = gfx::JPEGCodec::Decode(data.data(), data.size());
|
||||
if (!bitmap)
|
||||
auto bitmap = gfx::JPEGCodec::Decode(data);
|
||||
if (bitmap.isNull())
|
||||
return false;
|
||||
|
||||
// `JPEGCodec::Decode()` doesn't tell `SkBitmap` instance it creates
|
||||
|
@ -80,9 +80,9 @@ bool AddImageSkiaRepFromJPEG(gfx::ImageSkia* image,
|
|||
// 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);
|
||||
bitmap.setAlphaType(SkAlphaType::kOpaque_SkAlphaType);
|
||||
|
||||
image->AddRepresentation(gfx::ImageSkiaRep(*bitmap, scale_factor));
|
||||
image->AddRepresentation(gfx::ImageSkiaRep(bitmap, scale_factor));
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue