Compare commits

...

2 Commits

Author SHA256 Message Date
92ec70de8e update to 140.0.7299.0 2025-07-20 13:09:41 +02:00
7b4d623013 sync beta changes up to 139.0.7258.42 2025-07-20 13:05:41 +02:00
5 changed files with 100 additions and 79 deletions

BIN
chromium-140.0.7259.2.tar.xz (Stored with Git LFS)

Binary file not shown.

BIN
chromium-140.0.7299.0.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -1,8 +1,8 @@
-------------------------------------------------------------------
Tue Jul 1 18:02:29 CEST 2025 - ro@suse.de
Sun Jul 20 11:09:24 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
- Chromium 140.0.7259.2
(dev released 2025-06-26)
- Chromium 140.0.7299.0
(dev released 2025-07-17)
- modified patches:
chromium-125-compiler.patch
ppc-fedora-fix-unknown-warning-option-messages.diff
@@ -16,10 +16,10 @@ Tue Jul 1 18:02:29 CEST 2025 - ro@suse.de
- do not use system_harfbuzz for 16+ for now, unbundle is broken
-------------------------------------------------------------------
Tue Jul 1 12:21:01 CEST 2025 - ro@suse.de
Wed Jul 16 19:56:18 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
- Chromium 139.0.7258.5
(beta released 2025-06-25)
- Chromium 139.0.7258.42
(beta released 2025-07-16)
- modified patches:
gcc-enable-lto.patch
ppc-fedora-0001-sandbox-linux-Update-syscall-helpers-lists-for-ppc64.patch
@@ -46,6 +46,21 @@ Tue Jul 1 12:21:01 CEST 2025 - ro@suse.de
added third_party/ffmpeg (gave up on reverting all recent
commits in the code using ffmpeg, need at least ffmpeg-7)
-------------------------------------------------------------------
Tue Jul 15 19:46:14 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
- Chromium 138.0.7204.157 (boo#1246558):
* CVE-2025-7656: Integer overflow in V8
* CVE-2025-6558: Incorrect validation of untrusted input in ANGLE
and GPU
* CVE-2025-7657: Use after free in WebRTC
-------------------------------------------------------------------
Wed Jul 9 16:52:34 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
- Chromium 138.0.7204.100:
* tweaks to the Google services settings page
-------------------------------------------------------------------
Tue Jul 1 12:18:23 CEST 2025 - ro@suse.de

View File

@@ -108,7 +108,7 @@
%define n_suffix %{nil}
%endif
Name: chromium%{n_suffix}
Version: 140.0.7259.2
Version: 140.0.7299.0
Release: 0
Summary: Google's open source browser project
License: BSD-3-Clause AND LGPL-2.1-or-later

View File

@@ -1,8 +1,8 @@
Index: chromium-136.0.7103.48/third_party/skia/BUILD.gn
Index: chromium-138.0.7204.35/third_party/skia/BUILD.gn
===================================================================
--- chromium-136.0.7103.48.orig/third_party/skia/BUILD.gn
+++ chromium-136.0.7103.48/third_party/skia/BUILD.gn
@@ -193,6 +193,12 @@
--- chromium-138.0.7204.35.orig/third_party/skia/BUILD.gn
+++ chromium-138.0.7204.35/third_party/skia/BUILD.gn
@@ -193,6 +193,12 @@ opts("lasx") {
cflags = [ "-mlasx" ]
}
@@ -15,7 +15,7 @@ Index: chromium-136.0.7103.48/third_party/skia/BUILD.gn
# Any feature of Skia that requires third-party code should be optional and use this template.
template("optional") {
if (invoker.enabled) {
@@ -1693,6 +1699,7 @@
@@ -1661,6 +1667,7 @@ skia_component("skia") {
":skx",
":typeface_fontations",
":vello",
@@ -23,10 +23,10 @@ Index: chromium-136.0.7103.48/third_party/skia/BUILD.gn
":webp_decode",
":wuffs",
":xml",
Index: chromium-136.0.7103.48/third_party/skia/gn/skia/BUILD.gn
Index: chromium-138.0.7204.35/third_party/skia/gn/skia/BUILD.gn
===================================================================
--- chromium-136.0.7103.48.orig/third_party/skia/gn/skia/BUILD.gn
+++ chromium-136.0.7103.48/third_party/skia/gn/skia/BUILD.gn
--- chromium-138.0.7204.35.orig/third_party/skia/gn/skia/BUILD.gn
+++ chromium-138.0.7204.35/third_party/skia/gn/skia/BUILD.gn
@@ -175,6 +175,8 @@ config("default") {
"-mfpmath=sse",
]
@@ -36,11 +36,11 @@ Index: chromium-136.0.7103.48/third_party/skia/gn/skia/BUILD.gn
} else if (current_cpu == "loong64") {
cflags += [
"-mlsx",
Index: chromium-136.0.7103.48/third_party/skia/include/core/SkTypes.h
Index: chromium-138.0.7204.35/third_party/skia/include/core/SkTypes.h
===================================================================
--- chromium-136.0.7103.48.orig/third_party/skia/include/core/SkTypes.h
+++ chromium-136.0.7103.48/third_party/skia/include/core/SkTypes.h
@@ -188,4 +188,43 @@ static constexpr uint32_t SK_InvalidGenI
--- chromium-138.0.7204.35.orig/third_party/skia/include/core/SkTypes.h
+++ chromium-138.0.7204.35/third_party/skia/include/core/SkTypes.h
@@ -194,4 +194,43 @@ static constexpr uint32_t SK_InvalidGenI
*/
static constexpr uint32_t SK_InvalidUniqueID = 0;
@@ -84,10 +84,10 @@ Index: chromium-136.0.7103.48/third_party/skia/include/core/SkTypes.h
+#endif
+
#endif
Index: chromium-136.0.7103.48/third_party/skia/src/base/SkSpinlock.cpp
Index: chromium-138.0.7204.35/third_party/skia/src/base/SkSpinlock.cpp
===================================================================
--- chromium-136.0.7103.48.orig/third_party/skia/src/base/SkSpinlock.cpp
+++ chromium-136.0.7103.48/third_party/skia/src/base/SkSpinlock.cpp
--- chromium-138.0.7204.35.orig/third_party/skia/src/base/SkSpinlock.cpp
+++ chromium-138.0.7204.35/third_party/skia/src/base/SkSpinlock.cpp
@@ -33,7 +33,8 @@
#endif
@@ -98,10 +98,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/base/SkSpinlock.cpp
#include <emmintrin.h>
static void do_pause() { _mm_pause(); }
#else
Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkBitmapProcState_opts.h
Index: chromium-138.0.7204.35/third_party/skia/src/opts/SkBitmapProcState_opts.h
===================================================================
--- chromium-136.0.7103.48.orig/third_party/skia/src/opts/SkBitmapProcState_opts.h
+++ chromium-136.0.7103.48/third_party/skia/src/opts/SkBitmapProcState_opts.h
--- chromium-138.0.7204.35.orig/third_party/skia/src/opts/SkBitmapProcState_opts.h
+++ chromium-138.0.7204.35/third_party/skia/src/opts/SkBitmapProcState_opts.h
@@ -21,7 +21,13 @@
// The rest are scattershot at the moment but I want to get them
// all migrated to be normal code inside SkBitmapProcState.cpp.
@@ -117,10 +117,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkBitmapProcState_opts.h
#include <immintrin.h>
#elif defined(SK_ARM_HAS_NEON)
#include <arm_neon.h>
Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkBlitRow_opts.h
Index: chromium-138.0.7204.35/third_party/skia/src/opts/SkBlitRow_opts.h
===================================================================
--- chromium-136.0.7103.48.orig/third_party/skia/src/opts/SkBlitRow_opts.h
+++ chromium-136.0.7103.48/third_party/skia/src/opts/SkBlitRow_opts.h
--- chromium-138.0.7204.35.orig/third_party/skia/src/opts/SkBlitRow_opts.h
+++ chromium-138.0.7204.35/third_party/skia/src/opts/SkBlitRow_opts.h
@@ -69,7 +69,7 @@
#endif
@@ -130,10 +130,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkBlitRow_opts.h
static inline __m128i SkPMSrcOver_SSE2(const __m128i& src, const __m128i& dst) {
__m128i scale = _mm_sub_epi32(_mm_set1_epi32(256),
Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
Index: chromium-138.0.7204.35/third_party/skia/src/opts/SkRasterPipeline_opts.h
===================================================================
--- chromium-136.0.7103.48.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h
+++ chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
--- chromium-138.0.7204.35.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h
+++ chromium-138.0.7204.35/third_party/skia/src/opts/SkRasterPipeline_opts.h
@@ -1,5 +1,6 @@
/*
* Copyright 2018 Google Inc.
@@ -159,7 +159,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
#elif defined(SKRP_CPU_LASX)
#include <lasxintrin.h>
#include <lsxintrin.h>
@@ -200,6 +205,184 @@ namespace SK_OPTS_NS {
@@ -202,6 +207,192 @@ namespace SK_OPTS_NS {
ptr[3] = a;
}
@@ -226,6 +226,14 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
+ SI V<T> gather(const T* p, U32 ix) {
+ return {p[ix[0]], p[ix[1]], p[ix[2]], p[ix[3]]};
+ }
+ template <typename T>
+ SI V<T> gather_unaligned(const T* ptr, U32 ix) {
+ // This tells the compiler ptr might not be aligned appropriately, so
+ // it generates better assembly.
+ typedef T __attribute__ ((aligned (1))) unaligned_ptr;
+ const unaligned_ptr* uptr = static_cast<const unaligned_ptr*>(ptr);
+ return V<T>{uptr[ix[0]], uptr[ix[1]], uptr[ix[2]], uptr[ix[3]]};
+ }
+ template <typename V, typename S>
+ SI void scatter_masked(V src, S* dst, U32 ix, I32 mask) {
+ V before = gather(dst, ix);
@@ -344,7 +352,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
#elif defined(SKRP_CPU_NEON)
template <typename T> using V = Vec<4, T>;
using F = V<float >;
@@ -1389,6 +1572,15 @@ SI F from_half(U16 h) {
@@ -1427,6 +1618,15 @@ SI F from_half(U16 h) {
#elif defined(SKRP_CPU_HSW)
return _mm256_cvtph_ps((__m128i)h);
@@ -360,7 +368,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
#else
// Remember, a half is 1-5-10 (sign-exponent-mantissa) with 15 exponent bias.
U32 sem = expand(h),
@@ -1412,6 +1604,16 @@ SI U16 to_half(F f) {
@@ -1450,6 +1650,16 @@ SI U16 to_half(F f) {
#elif defined(SKRP_CPU_HSW)
return (U16)_mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION);
@@ -377,7 +385,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
#else
// Remember, a float is 1-8-23 (sign-exponent-mantissa) with 127 exponent bias.
U32 sem = sk_bit_cast<U32>(f),
@@ -1492,7 +1694,7 @@ static constexpr size_t N = sizeof(F) /
@@ -1530,7 +1740,7 @@ static constexpr size_t N = sizeof(F) /
// instead of {b,a} on the stack. Narrow stages work best for __vectorcall.
#define ABI __vectorcall
#define SKRP_NARROW_STAGES 1
@@ -386,7 +394,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
// These platforms are ideal for wider stages, and their default ABI is ideal.
#define ABI
#define SKRP_NARROW_STAGES 0
@@ -5501,6 +5703,10 @@ SI F sqrt_(F x) {
@@ -5539,6 +5749,10 @@ SI F sqrt_(F x) {
float32x4_t lo,hi;
split(x, &lo,&hi);
return join<F>(sqrt(lo), sqrt(hi));
@@ -397,7 +405,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
#elif defined(SKRP_CPU_LASX)
__m256 lo,hi;
split(x, &lo,&hi);
@@ -5532,6 +5738,10 @@ SI F floor_(F x) {
@@ -5570,6 +5784,10 @@ SI F floor_(F x) {
__m128 lo,hi;
split(x, &lo,&hi);
return join<F>(_mm_floor_ps(lo), _mm_floor_ps(hi));
@@ -408,7 +416,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
#elif defined(SKRP_CPU_LASX)
__m256 lo,hi;
split(x, &lo,&hi);
@@ -5551,6 +5761,7 @@ SI F floor_(F x) {
@@ -5589,6 +5807,7 @@ SI F floor_(F x) {
// (2 * a * b + (1 << 15)) >> 16
// The result is a number on [-1, 1).
// Note: on neon this is a saturating multiply while the others are not.
@@ -416,7 +424,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
SI I16 scaled_mult(I16 a, I16 b) {
#if defined(SKRP_CPU_SKX)
return (I16)_mm256_mulhrs_epi16((__m256i)a, (__m256i)b);
@@ -5562,6 +5773,22 @@ SI I16 scaled_mult(I16 a, I16 b) {
@@ -5600,6 +5819,22 @@ SI I16 scaled_mult(I16 a, I16 b) {
return vqrdmulhq_s16(a, b);
#elif defined(SKRP_CPU_NEON)
return vqrdmulhq_s16(a, b);
@@ -439,7 +447,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
#elif defined(SKRP_CPU_LASX)
I16 res = __lasx_xvmuh_h(a, b);
return __lasx_xvslli_h(res, 1);
@@ -5589,7 +5816,26 @@ SI U16 constrained_add(I16 a, U16 b) {
@@ -5627,7 +5862,26 @@ SI U16 constrained_add(I16 a, U16 b) {
SkASSERT(-ib <= ia && ia <= 65535 - ib);
}
#endif
@@ -466,7 +474,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
}
SI F fract(F x) { return x - floor_(x); }
@@ -6606,8 +6852,14 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
@@ -6683,8 +6937,14 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
// 2^-8 * v = 2^-9 * (tx*(R - L) + (R + L))
// v = 1/2 * (tx*(R - L) + (R + L))
auto lerpX = [&](U16 left, U16 right) -> U16 {
@@ -481,7 +489,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
// The constrained_add is the most subtle part of lerp. The first term is on the interval
// [-1, 1), and the second term is on the interval is on the interval [0, 1) because
// both terms are too high by a factor of 2 which will be handled below. (Both R and L are
@@ -6619,7 +6871,12 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
@@ -6696,7 +6956,12 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
U16 v2 = constrained_add(scaled_mult(tx, width), middle) + 1;
// Divide by 2 to calculate v and at the same time bring the intermediate value onto the
// interval [0, 1/2] to set up for the lerpY.
@@ -494,7 +502,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
};
const uint32_t* ptr;
@@ -6653,9 +6910,15 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
@@ -6730,9 +6995,15 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
I16 width = (I16)bottom - (I16)top;
U16 middle = bottom + top;
// Add + 0x80 for rounding.
@@ -511,10 +519,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
};
r = lerpY(topR, bottomR);
Index: chromium-136.0.7103.48/third_party/skia/src/base/SkVx.h
Index: chromium-138.0.7204.35/third_party/skia/src/base/SkVx.h
===================================================================
--- chromium-136.0.7103.48.orig/third_party/skia/src/base/SkVx.h
+++ chromium-136.0.7103.48/third_party/skia/src/base/SkVx.h
--- chromium-138.0.7204.35.orig/third_party/skia/src/base/SkVx.h
+++ chromium-138.0.7204.35/third_party/skia/src/base/SkVx.h
@@ -41,7 +41,12 @@
#endif
@@ -529,10 +537,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/base/SkVx.h
#include <immintrin.h>
#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41
#include <smmintrin.h>
Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
Index: chromium-138.0.7204.35/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
===================================================================
--- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
+++ chromium-136.0.7103.48/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
--- chromium-138.0.7204.35.orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
+++ chromium-138.0.7204.35/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
@@ -9,7 +9,7 @@
#include "src/core/SkBlitMask.h"
#include "src/core/SkOptsTargets.h"
@@ -542,10 +550,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBlitMask_opts_ssse3.cp
// The order of these includes is important:
// 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget
Index: chromium-136.0.7103.48/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
Index: chromium-138.0.7204.35/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
===================================================================
--- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
+++ chromium-136.0.7103.48/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
--- chromium-138.0.7204.35.orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
+++ chromium-138.0.7204.35/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
@@ -10,7 +10,7 @@
#include "src/core/SkOptsTargets.h"
#include "src/core/SkSwizzlePriv.h"
@@ -555,10 +563,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/core/SkSwizzler_opts_ssse3.cp
!defined(SK_ENABLE_OPTIMIZE_SIZE) && \
SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3
Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBlitMask_opts.cpp
Index: chromium-138.0.7204.35/third_party/skia/src/core/SkBlitMask_opts.cpp
===================================================================
--- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkBlitMask_opts.cpp
+++ chromium-136.0.7103.48/third_party/skia/src/core/SkBlitMask_opts.cpp
--- chromium-138.0.7204.35.orig/third_party/skia/src/core/SkBlitMask_opts.cpp
+++ chromium-138.0.7204.35/third_party/skia/src/core/SkBlitMask_opts.cpp
@@ -25,7 +25,7 @@ namespace SkOpts {
static bool init() {
#if defined(SK_ENABLE_OPTIMIZE_SIZE)
@@ -568,10 +576,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBlitMask_opts.cpp
#if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3
if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BlitMask_ssse3(); }
#endif
Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBitmapProcState_opts.cpp
Index: chromium-138.0.7204.35/third_party/skia/src/core/SkBitmapProcState_opts.cpp
===================================================================
--- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp
+++ chromium-136.0.7103.48/third_party/skia/src/core/SkBitmapProcState_opts.cpp
--- chromium-138.0.7204.35.orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp
+++ chromium-138.0.7204.35/third_party/skia/src/core/SkBitmapProcState_opts.cpp
@@ -27,7 +27,7 @@ namespace SkOpts {
static bool init() {
#if defined(SK_ENABLE_OPTIMIZE_SIZE)
@@ -581,10 +589,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBitmapProcState_opts.c
#if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3
if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BitmapProcState_ssse3(); }
#endif
Index: chromium-136.0.7103.48/third_party/skia/src/core/SkCpu.h
Index: chromium-138.0.7204.35/third_party/skia/src/core/SkCpu.h
===================================================================
--- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkCpu.h
+++ chromium-136.0.7103.48/third_party/skia/src/core/SkCpu.h
--- chromium-138.0.7204.35.orig/third_party/skia/src/core/SkCpu.h
+++ chromium-138.0.7204.35/third_party/skia/src/core/SkCpu.h
@@ -60,7 +60,7 @@ inline bool SkCpu::Supports(uint32_t mas
// If we mask in compile-time known lower limits, the compiler can
@@ -594,10 +602,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/core/SkCpu.h
#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
features |= SSE1;
#endif
Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
Index: chromium-138.0.7204.35/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
===================================================================
--- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
+++ chromium-136.0.7103.48/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
--- chromium-138.0.7204.35.orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
+++ chromium-138.0.7204.35/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
@@ -8,7 +8,7 @@
#include "include/private/base/SkFeatures.h"
#include "src/core/SkOptsTargets.h"
@@ -607,10 +615,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBitmapProcState_opts_s
// The order of these includes is important:
// 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget
Index: chromium-136.0.7103.48/third_party/skia/include/private/base/SkFeatures.h
Index: chromium-138.0.7204.35/third_party/skia/include/private/base/SkFeatures.h
===================================================================
--- chromium-136.0.7103.48.orig/third_party/skia/include/private/base/SkFeatures.h
+++ chromium-136.0.7103.48/third_party/skia/include/private/base/SkFeatures.h
--- chromium-138.0.7204.35.orig/third_party/skia/include/private/base/SkFeatures.h
+++ chromium-138.0.7204.35/third_party/skia/include/private/base/SkFeatures.h
@@ -63,6 +63,8 @@
#if defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
@@ -620,10 +628,10 @@ Index: chromium-136.0.7103.48/third_party/skia/include/private/base/SkFeatures.h
#endif
#if defined(__loongarch__) || defined (__loongarch64)
Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkSwizzler_opts.inc
Index: chromium-138.0.7204.35/third_party/skia/src/opts/SkSwizzler_opts.inc
===================================================================
--- chromium-136.0.7103.48.orig/third_party/skia/src/opts/SkSwizzler_opts.inc
+++ chromium-136.0.7103.48/third_party/skia/src/opts/SkSwizzler_opts.inc
--- chromium-138.0.7204.35.orig/third_party/skia/src/opts/SkSwizzler_opts.inc
+++ chromium-138.0.7204.35/third_party/skia/src/opts/SkSwizzler_opts.inc
@@ -14,7 +14,10 @@
#include <cmath>
#include <utility>
@@ -670,11 +678,11 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkSwizzler_opts.inc
#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1 && (defined(__clang__) || !defined(_MSC_VER))
// -- SSE -- Harden against timing attacks -- MSVC is not supported.
using F4 = __m128;
Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBlitter_ARGB32.cpp
Index: chromium-138.0.7204.35/third_party/skia/src/core/SkBlitter_ARGB32.cpp
===================================================================
--- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkBlitter_ARGB32.cpp
+++ chromium-136.0.7103.48/third_party/skia/src/core/SkBlitter_ARGB32.cpp
@@ -127,6 +127,16 @@ static inline SkPMColor blend_lcd16_opaq
--- chromium-138.0.7204.35.orig/third_party/skia/src/core/SkBlitter_ARGB32.cpp
+++ chromium-138.0.7204.35/third_party/skia/src/core/SkBlitter_ARGB32.cpp
@@ -129,6 +129,16 @@ static inline SkPMColor blend_lcd16_opaq
#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
#include <emmintrin.h>
@@ -691,5 +699,3 @@ Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBlitter_ARGB32.cpp
// The following (left) shifts cause the top 5 bits of the mask components to
// line up with the corresponding components in an SkPMColor.
// Note that the mask's RGB16 order may differ from the SkPMColor order.
--- chromium-139.0.7258.5/third_party/skia/BUILD.gn 2025/06/29 22:34:42 1.1
+++ chromium-139.0.7258.5/third_party/skia/BUILD.gn 2025/06/29 22:35:06