@ -1,8 +1,8 @@
Index: chromium-13 0.0.6723.44 /third_party/skia/BUILD.gn
Index: chromium-13 2.0.6834.83 /third_party/skia/BUILD.gn
===================================================================
--- chromium-13 0.0.6723.44 .orig/third_party/skia/BUILD.gn
+++ chromium-13 0.0.6723.44 /third_party/skia/BUILD.gn
@@ -19 2,6 +192 ,12 @@ opts("lasx") {
--- chromium-13 2.0.6834.83 .orig/third_party/skia/BUILD.gn
+++ chromium-13 2.0.6834.83 /third_party/skia/BUILD.gn
@@ -19 3,6 +193 ,12 @@ opts("lasx") {
cflags = [ "-mlasx" ]
}
@ -15,7 +15,7 @@ Index: chromium-130.0.6723.44/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) {
@@ -1 466,6 +1472 ,7 @@ skia_component("skia") {
@@ -1 601,6 +1607 ,7 @@ skia_component("skia") {
":skx",
":typeface_fontations",
":vello",
@ -23,7 +23,7 @@ Index: chromium-130.0.6723.44/third_party/skia/BUILD.gn
":webp_decode",
":wuffs",
":xml",
@@ -1 637,7 +1644 ,10 @@ skia_static_library("pathkit") {
@@ -1 772,7 +1779 ,10 @@ skia_static_library("pathkit") {
public_configs = [ ":skia_public" ]
configs = skia_library_configs
@ -35,10 +35,10 @@ Index: chromium-130.0.6723.44/third_party/skia/BUILD.gn
sources = []
sources += skia_pathops_sources
Index: chromium-13 0.0.6723.44 /third_party/skia/gn/skia/BUILD.gn
Index: chromium-13 2.0.6834.83 /third_party/skia/gn/skia/BUILD.gn
===================================================================
--- chromium-13 0.0.6723.44 .orig/third_party/skia/gn/skia/BUILD.gn
+++ chromium-13 0.0.6723.44 /third_party/skia/gn/skia/BUILD.gn
--- chromium-13 2.0.6834.83 .orig/third_party/skia/gn/skia/BUILD.gn
+++ chromium-13 2.0.6834.83 /third_party/skia/gn/skia/BUILD.gn
@@ -167,6 +167,8 @@ config("default") {
"-mfpmath=sse",
]
@ -48,11 +48,11 @@ Index: chromium-130.0.6723.44/third_party/skia/gn/skia/BUILD.gn
} else if (current_cpu == "loong64") {
cflags += [
"-mlsx",
Index: chromium-13 0.0.6723.44 /third_party/skia/include/core/SkTypes.h
Index: chromium-13 2.0.6834.83 /third_party/skia/include/core/SkTypes.h
===================================================================
--- chromium-13 0.0.6723.44 .orig/third_party/skia/include/core/SkTypes.h
+++ chromium-13 0.0.6723.44 /third_party/skia/include/core/SkTypes.h
@@ -1 7 8,4 +17 8,43 @@ static constexpr uint32_t SK_InvalidGenI
--- chromium-13 2.0.6834.83 .orig/third_party/skia/include/core/SkTypes.h
+++ chromium-13 2.0.6834.83 /third_party/skia/include/core/SkTypes.h
@@ -1 83 ,4 +183 ,43 @@ static constexpr uint32_t SK_InvalidGenI
*/
static constexpr uint32_t SK_InvalidUniqueID = 0;
@ -96,10 +96,10 @@ Index: chromium-130.0.6723.44/third_party/skia/include/core/SkTypes.h
+#endif
+
#endif
Index: chromium-13 0.0.6723.44 /third_party/skia/src/base/SkSpinlock.cpp
Index: chromium-13 2.0.6834.83 /third_party/skia/src/base/SkSpinlock.cpp
===================================================================
--- chromium-13 0.0.6723.44 .orig/third_party/skia/src/base/SkSpinlock.cpp
+++ chromium-13 0.0.6723.44 /third_party/skia/src/base/SkSpinlock.cpp
--- chromium-13 2.0.6834.83 .orig/third_party/skia/src/base/SkSpinlock.cpp
+++ chromium-13 2.0.6834.83 /third_party/skia/src/base/SkSpinlock.cpp
@@ -33,7 +33,8 @@
#endif
@ -110,10 +110,10 @@ Index: chromium-130.0.6723.44/third_party/skia/src/base/SkSpinlock.cpp
#include <emmintrin.h>
static void do_pause() { _mm_pause(); }
#else
Index: chromium-13 0.0.6723.44 /third_party/skia/src/opts/SkBitmapProcState_opts.h
Index: chromium-13 2.0.6834.83 /third_party/skia/src/opts/SkBitmapProcState_opts.h
===================================================================
--- chromium-13 0.0.6723.44 .orig/third_party/skia/src/opts/SkBitmapProcState_opts.h
+++ chromium-13 0.0.6723.44 /third_party/skia/src/opts/SkBitmapProcState_opts.h
--- chromium-13 2.0.6834.83 .orig/third_party/skia/src/opts/SkBitmapProcState_opts.h
+++ chromium-13 2.0.6834.83 /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.
@ -129,10 +129,10 @@ Index: chromium-130.0.6723.44/third_party/skia/src/opts/SkBitmapProcState_opts.h
#include <immintrin.h>
#elif defined(SK_ARM_HAS_NEON)
#include <arm_neon.h>
Index: chromium-13 0.0.6723.44 /third_party/skia/src/opts/SkBlitRow_opts.h
Index: chromium-13 2.0.6834.83 /third_party/skia/src/opts/SkBlitRow_opts.h
===================================================================
--- chromium-13 0.0.6723.44 .orig/third_party/skia/src/opts/SkBlitRow_opts.h
+++ chromium-13 0.0.6723.44 /third_party/skia/src/opts/SkBlitRow_opts.h
--- chromium-13 2.0.6834.83 .orig/third_party/skia/src/opts/SkBlitRow_opts.h
+++ chromium-13 2.0.6834.83 /third_party/skia/src/opts/SkBlitRow_opts.h
@@ -69,7 +69,7 @@
#endif
@ -142,10 +142,10 @@ Index: chromium-130.0.6723.44/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-13 0.0.6723.44 /third_party/skia/src/opts/SkRasterPipeline_opts.h
Index: chromium-13 2.0.6834.83 /third_party/skia/src/opts/SkRasterPipeline_opts.h
===================================================================
--- chromium-13 0.0.6723.44 .orig/third_party/skia/src/opts/SkRasterPipeline_opts.h
+++ chromium-13 0.0.6723.44 /third_party/skia/src/opts/SkRasterPipeline_opts.h
--- chromium-13 2.0.6834.83 .orig/third_party/skia/src/opts/SkRasterPipeline_opts.h
+++ chromium-13 2.0.6834.83 /third_party/skia/src/opts/SkRasterPipeline_opts.h
@@ -1,5 +1,6 @@
/*
* Copyright 2018 Google Inc.
@ -523,29 +523,28 @@ Index: chromium-130.0.6723.44/third_party/skia/src/opts/SkRasterPipeline_opts.h
};
r = lerpY(topR, bottomR);
Index: chromium-13 0.0.6723.44 /third_party/skia/src/base/SkVx.h
Index: chromium-13 2.0.6834.83 /third_party/skia/src/base/SkVx.h
===================================================================
--- chromium-130.0.6723.44.orig/third_party/skia/src/base/SkVx.h
+++ chromium-130.0.6723.44/third_party/skia/src/base/SkVx.h
@@ -42,7 +42,13 @@
--- chromium-132.0.6834.83.orig/third_party/skia/src/base/SkVx.h
+++ chromium-132.0.6834.83/third_party/skia/src/base/SkVx.h
@@ -41,7 +41,12 @@
#endif
#if SKVX_USE_SIMD
#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
- #include <immintrin.h>
- #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_AVX
+ #if __PPC64__
+ #define NO_WARN_X86_INTRINSICS
+ #include <mmintrin.h>
+ #include <emmintrin.h>
+ #include <tmmintrin.h>
+ #else
+ #include <immintrin.h>
+ #endif
#elif defined(SK_ARM_HAS_NEON)
#include <arm_neon.h>
#elif defined(__wasm_simd128__)
Index: chromium-130.0.6723.44/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
+ #elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_AVX
#include <immintrin.h>
#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41
#include <smmintrin.h>
Index: chromium-132.0.6834.83/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
===================================================================
--- chromium-13 0.0.6723.44 .orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
+++ chromium-13 0.0.6723.44 /third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
--- chromium-132.0.6834.83.orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
+++ chromium-13 2.0.6834.83 /third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
@@ -9,7 +9,7 @@
#include "src/core/SkBlitMask.h"
#include "src/core/SkOptsTargets.h"
@ -555,10 +554,10 @@ Index: chromium-130.0.6723.44/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-13 0.0.6723.44 /third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
Index: chromium-13 2.0.6834.83 /third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
===================================================================
--- chromium-13 0.0.6723.44 .orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
+++ chromium-13 0.0.6723.44 /third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
--- chromium-13 2.0.6834.83 .orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
+++ chromium-13 2.0.6834.83 /third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
@@ -10,7 +10,7 @@
#include "src/core/SkOptsTargets.h"
#include "src/core/SkSwizzlePriv.h"
@ -568,10 +567,10 @@ Index: chromium-130.0.6723.44/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-13 0.0.6723.44 /third_party/skia/src/core/SkBlitMask_opts.cpp
Index: chromium-13 2.0.6834.83 /third_party/skia/src/core/SkBlitMask_opts.cpp
===================================================================
--- chromium-13 0.0.6723.44 .orig/third_party/skia/src/core/SkBlitMask_opts.cpp
+++ chromium-13 0.0.6723.44 /third_party/skia/src/core/SkBlitMask_opts.cpp
--- chromium-13 2.0.6834.83 .orig/third_party/skia/src/core/SkBlitMask_opts.cpp
+++ chromium-13 2.0.6834.83 /third_party/skia/src/core/SkBlitMask_opts.cpp
@@ -25,7 +25,7 @@ namespace SkOpts {
static bool init() {
#if defined(SK_ENABLE_OPTIMIZE_SIZE)
@ -581,10 +580,10 @@ Index: chromium-130.0.6723.44/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-13 0.0.6723.44 /third_party/skia/src/core/SkBitmapProcState_opts.cpp
Index: chromium-13 2.0.6834.83 /third_party/skia/src/core/SkBitmapProcState_opts.cpp
===================================================================
--- chromium-13 0.0.6723.44 .orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp
+++ chromium-13 0.0.6723.44 /third_party/skia/src/core/SkBitmapProcState_opts.cpp
--- chromium-13 2.0.6834.83 .orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp
+++ chromium-13 2.0.6834.83 /third_party/skia/src/core/SkBitmapProcState_opts.cpp
@@ -27,7 +27,7 @@ namespace SkOpts {
static bool init() {
#if defined(SK_ENABLE_OPTIMIZE_SIZE)
@ -594,10 +593,10 @@ Index: chromium-130.0.6723.44/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-13 0.0.6723.44 /third_party/skia/src/core/SkCpu.h
Index: chromium-13 2.0.6834.83 /third_party/skia/src/core/SkCpu.h
===================================================================
--- chromium-13 0.0.6723.44 .orig/third_party/skia/src/core/SkCpu.h
+++ chromium-13 0.0.6723.44 /third_party/skia/src/core/SkCpu.h
--- chromium-13 2.0.6834.83 .orig/third_party/skia/src/core/SkCpu.h
+++ chromium-13 2.0.6834.83 /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
@ -607,10 +606,10 @@ Index: chromium-130.0.6723.44/third_party/skia/src/core/SkCpu.h
#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
features |= SSE1;
#endif
Index: chromium-13 0.0.6723.44 /third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
Index: chromium-13 2.0.6834.83 /third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
===================================================================
--- chromium-13 0.0.6723.44 .orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
+++ chromium-13 0.0.6723.44 /third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
--- chromium-13 2.0.6834.83 .orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
+++ chromium-13 2.0.6834.83 /third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
@@ -8,7 +8,7 @@
#include "include/private/base/SkFeatures.h"
#include "src/core/SkOptsTargets.h"
@ -620,10 +619,10 @@ Index: chromium-130.0.6723.44/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-13 0.0.6723.44 /third_party/skia/include/private/base/SkFeatures.h
Index: chromium-13 2.0.6834.83 /third_party/skia/include/private/base/SkFeatures.h
===================================================================
--- chromium-13 0.0.6723.44 .orig/third_party/skia/include/private/base/SkFeatures.h
+++ chromium-13 0.0.6723.44 /third_party/skia/include/private/base/SkFeatures.h
--- chromium-13 2.0.6834.83 .orig/third_party/skia/include/private/base/SkFeatures.h
+++ chromium-13 2.0.6834.83 /third_party/skia/include/private/base/SkFeatures.h
@@ -63,6 +63,8 @@
#if defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
@ -633,22 +632,10 @@ Index: chromium-130.0.6723.44/third_party/skia/include/private/base/SkFeatures.h
#endif
#if defined(__loongarch__) || defined (__loongarch64)
Index: chromium-130.0.6723.44/third_party/skia/modules/skcms/src/skcms_internals.h
===================================================================
--- chromium-130.0.6723.44.orig/third_party/skia/modules/skcms/src/skcms_internals.h
+++ chromium-130.0.6723.44/third_party/skia/modules/skcms/src/skcms_internals.h
@@ -47,6 +47,7 @@ extern "C" {
&& !defined(__EMSCRIPTEN__) \
&& !defined(__arm__) \
&& !defined(__riscv) \
+ && !defined(__powerpc64__) \
&& !defined(__loongarch__) \
&& !defined(_WIN32) && !defined(__SYMBIAN32__)
#define SKCMS_HAS_MUSTTAIL 1
Index: chromium-130.0.6723.44/third_party/skia/src/opts/SkSwizzler_opts.inc
Index: chromium-132.0.6834.83/third_party/skia/src/opts/SkSwizzler_opts.inc
===================================================================
--- chromium-13 0.0.6723.44 .orig/third_party/skia/src/opts/SkSwizzler_opts.inc
+++ chromium-13 0.0.6723.44 /third_party/skia/src/opts/SkSwizzler_opts.inc
--- chromium-132.0.6834.83.orig/third_party/skia/src/opts/SkSwizzler_opts.inc
+++ chromium-132.0.6834.83/third_party/skia/src/opts/SkSwizzler_opts.inc
@@ -14,7 +14,10 @@
#include <cmath>
#include <utility>
@ -695,10 +682,10 @@ Index: chromium-130.0.6723.44/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-13 0.0.6723.44 /third_party/skia/src/core/SkBlitter_ARGB32.cpp
Index: chromium-13 2.0.6834.83 /third_party/skia/src/core/SkBlitter_ARGB32.cpp
===================================================================
--- chromium-13 0.0.6723.44 .orig/third_party/skia/src/core/SkBlitter_ARGB32.cpp
+++ chromium-13 0.0.6723.44 /third_party/skia/src/core/SkBlitter_ARGB32.cpp
--- chromium-13 2.0.6834.83 .orig/third_party/skia/src/core/SkBlitter_ARGB32.cpp
+++ chromium-13 2.0.6834.83 /third_party/skia/src/core/SkBlitter_ARGB32.cpp
@@ -126,6 +126,16 @@ static inline SkPMColor blend_lcd16_opaq
#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
#include <emmintrin.h>