- update to 129.0.6668.58

* High CVE-2024-8904: Type Confusion in V8
  * Medium CVE-2024-8905: Inappropriate implementation in V8
  * Medium CVE-2024-8906: Incorrect security UI in Downloads
  * Medium CVE-2024-8907: Insufficient data validation in Omnibox
  * Low CVE-2024-8908: Inappropriate implementation in Autofill
  * Low CVE-2024-8909: Inappropriate implementation in UI
i9e
Arkady L. Shane 2 months ago
parent 0f7bc12858
commit 6850bacb6f
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

@ -1,6 +1,6 @@
8877a957a7e572e6a9ea71be791fa6b87200db62 SOURCES/chromium-128.0.6613.137.tar.xz 3dd7b4225d77f919dbfa1a002a5f2f152357c545 SOURCES/chromium-129.0.6668.58.tar.xz
ccd15016324e640c40f6fc01ab076dc52196ea54 SOURCES/msspi-e91bd46306cc7044b2903cd07b788c13c36481e3.tar.xz ccd15016324e640c40f6fc01ab076dc52196ea54 SOURCES/msspi-e91bd46306cc7044b2903cd07b788c13c36481e3.tar.xz
9bd36edf9f2e882aad828ad88faa7b9d02566cea SOURCES/Chromium-Gost-648cc5b901f2447b9b12bc5b09b962ec802b025a.tar.xz 3b3602227af2be24789daeedf42ae02c2f6e29e9 SOURCES/Chromium-Gost-124a371049d7a087a24f25ee4c5ed51c897a157b.tar.xz
dea187019741602d57aaf189a80abba261fbd2aa SOURCES/linux-x64-0.19.2.tgz dea187019741602d57aaf189a80abba261fbd2aa SOURCES/linux-x64-0.19.2.tgz
7e5d2c7864c5c83ec789b59c77cd9c20d2594916 SOURCES/linux-arm64-0.19.2.tgz 7e5d2c7864c5c83ec789b59c77cd9c20d2594916 SOURCES/linux-arm64-0.19.2.tgz
769196d081c6a0ad37f1c63dec56febfff3370de SOURCES/node-v20.6.1-linux-x64.tar.xz 769196d081c6a0ad37f1c63dec56febfff3370de SOURCES/node-v20.6.1-linux-x64.tar.xz

4
.gitignore vendored

@ -1,10 +1,10 @@
SOURCES/chromium-128.0.6613.137.tar.xz SOURCES/chromium-129.0.6668.58.tar.xz
SOURCES/linux-x64-0.19.2.tgz SOURCES/linux-x64-0.19.2.tgz
SOURCES/linux-arm64-0.19.2.tgz SOURCES/linux-arm64-0.19.2.tgz
SOURCES/node-v20.6.1-linux-x64.tar.xz SOURCES/node-v20.6.1-linux-x64.tar.xz
SOURCES/node-v20.6.1-linux-arm64.tar.xz SOURCES/node-v20.6.1-linux-arm64.tar.xz
SOURCES/chromium-browser-gost-icons.tar.xz SOURCES/chromium-browser-gost-icons.tar.xz
SOURCES/msspi-e91bd46306cc7044b2903cd07b788c13c36481e3.tar.xz SOURCES/msspi-e91bd46306cc7044b2903cd07b788c13c36481e3.tar.xz
SOURCES/Chromium-Gost-648cc5b901f2447b9b12bc5b09b962ec802b025a.tar.xz SOURCES/Chromium-Gost-124a371049d7a087a24f25ee4c5ed51c897a157b.tar.xz
SOURCES/bindgen-cli-aarch64.tar.xz SOURCES/bindgen-cli-aarch64.tar.xz
SOURCES/bindgen-cli-x86_64.tar.xz SOURCES/bindgen-cli-x86_64.tar.xz

@ -1,10 +1,10 @@
Index: chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm Index: chromium-129.0.6668.42/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm +++ chromium-129.0.6668.42/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm
@@ -0,0 +1,95 @@ @@ -0,0 +1,95 @@
+; +;
+; Copyright (c) 2024, Alliance for Open Media. All rights reserved +; Copyright (c) 2024, Alliance for Open Media. All rights reserved.
+; +;
+; This source code is subject to the terms of the BSD 2 Clause License and +; This source code is subject to the terms of the BSD 2 Clause License and
+; the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License +; the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
@ -67,8 +67,8 @@ Index: chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/conf
+CONFIG_SALIENCY_MAP equ 0 +CONFIG_SALIENCY_MAP equ 0
+CONFIG_SHARED equ 0 +CONFIG_SHARED equ 0
+CONFIG_SIZE_LIMIT equ 1 +CONFIG_SIZE_LIMIT equ 1
+CONFIG_SPATIAL_RESAMPLING equ 1
+CONFIG_SPEED_STATS equ 0 +CONFIG_SPEED_STATS equ 0
+CONFIG_SVT_AV1 equ 1
+CONFIG_TFLITE equ 0 +CONFIG_TFLITE equ 0
+CONFIG_THREE_PASS equ 0 +CONFIG_THREE_PASS equ 0
+CONFIG_TUNE_BUTTERAUGLI equ 0 +CONFIG_TUNE_BUTTERAUGLI equ 0
@ -98,13 +98,13 @@ Index: chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/conf
+HAVE_VSX equ 1 +HAVE_VSX equ 1
+HAVE_WXWIDGETS equ 0 +HAVE_WXWIDGETS equ 0
+STATIC_LINK_JXL equ 0 +STATIC_LINK_JXL equ 0
Index: chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/config/aom_config.c Index: chromium-129.0.6668.42/third_party/libaom/source/config/linux/ppc64/config/aom_config.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/config/aom_config.c +++ chromium-129.0.6668.42/third_party/libaom/source/config/linux/ppc64/config/aom_config.c
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
+/* +/*
+ * Copyright (c) 2024, Alliance for Open Media. All rights reserved + * Copyright (c) 2024, Alliance for Open Media. All rights reserved.
+ * + *
+ * This source code is subject to the terms of the BSD 2 Clause License and + * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License + * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
@ -116,13 +116,13 @@ Index: chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/conf
+#include "aom/aom_codec.h" +#include "aom/aom_codec.h"
+static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/ppc-linux-gcc.cmake\" -DCONFIG_AV1_DECODER=0 -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_AV1_HIGHBITDEPTH=0 -DCONFIG_AV1_TEMPORAL_DENOISING=1 -DCONFIG_QUANT_MATRIX=0 -DCONFIG_REALTIME_ONLY=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384"; +static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/ppc-linux-gcc.cmake\" -DCONFIG_AV1_DECODER=0 -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_AV1_HIGHBITDEPTH=0 -DCONFIG_AV1_TEMPORAL_DENOISING=1 -DCONFIG_QUANT_MATRIX=0 -DCONFIG_REALTIME_ONLY=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384";
+const char *aom_codec_build_config(void) {return cfg;} +const char *aom_codec_build_config(void) {return cfg;}
Index: chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/config/aom_config.h Index: chromium-129.0.6668.42/third_party/libaom/source/config/linux/ppc64/config/aom_config.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/config/aom_config.h +++ chromium-129.0.6668.42/third_party/libaom/source/config/linux/ppc64/config/aom_config.h
@@ -0,0 +1,99 @@ @@ -0,0 +1,98 @@
+/* +/*
+ * Copyright (c) 2024, Alliance for Open Media. All rights reserved + * Copyright (c) 2024, Alliance for Open Media. All rights reserved.
+ * + *
+ * This source code is subject to the terms of the BSD 2 Clause License and + * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License + * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
@ -187,8 +187,8 @@ Index: chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/conf
+#define CONFIG_SALIENCY_MAP 0 +#define CONFIG_SALIENCY_MAP 0
+#define CONFIG_SHARED 0 +#define CONFIG_SHARED 0
+#define CONFIG_SIZE_LIMIT 1 +#define CONFIG_SIZE_LIMIT 1
+#define CONFIG_SPATIAL_RESAMPLING 1
+#define CONFIG_SPEED_STATS 0 +#define CONFIG_SPEED_STATS 0
+#define CONFIG_SVT_AV1 1
+#define CONFIG_TFLITE 0 +#define CONFIG_TFLITE 0
+#define CONFIG_THREE_PASS 0 +#define CONFIG_THREE_PASS 0
+#define CONFIG_TUNE_BUTTERAUGLI 0 +#define CONFIG_TUNE_BUTTERAUGLI 0
@ -217,14 +217,24 @@ Index: chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/conf
+#define HAVE_UNISTD_H 1 +#define HAVE_UNISTD_H 1
+#define HAVE_VSX 1 +#define HAVE_VSX 1
+#define HAVE_WXWIDGETS 0 +#define HAVE_WXWIDGETS 0
+#define INLINE inline
+#define STATIC_LINK_JXL 0 +#define STATIC_LINK_JXL 0
+#endif // AOM_CONFIG_H_ +#endif // AOM_CONFIG_H_
Index: chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h Index: chromium-129.0.6668.42/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h +++ chromium-129.0.6668.42/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h
@@ -0,0 +1,1541 @@ @@ -0,0 +1,1501 @@
+/*
+ * Copyright (c) 2024, Alliance for Open Media. All rights reserved.
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+// This file is generated. Do not edit. +// This file is generated. Do not edit.
+#ifndef AOM_DSP_RTCD_H_ +#ifndef AOM_DSP_RTCD_H_
+#define AOM_DSP_RTCD_H_ +#define AOM_DSP_RTCD_H_
@ -273,9 +283,6 @@ Index: chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/conf
+void aom_comp_mask_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, int height, const uint8_t *ref, int ref_stride, const uint8_t *mask, int mask_stride, int invert_mask); +void aom_comp_mask_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, int height, const uint8_t *ref, int ref_stride, const uint8_t *mask, int mask_stride, int invert_mask);
+#define aom_comp_mask_pred aom_comp_mask_pred_c +#define aom_comp_mask_pred aom_comp_mask_pred_c
+ +
+void aom_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
+#define aom_convolve8 aom_convolve8_c
+
+void aom_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +void aom_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+#define aom_convolve8_horiz aom_convolve8_horiz_c +#define aom_convolve8_horiz aom_convolve8_horiz_c
+ +
@ -822,99 +829,51 @@ Index: chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/conf
+unsigned int aom_masked_sad128x128_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask); +unsigned int aom_masked_sad128x128_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad128x128 aom_masked_sad128x128_c +#define aom_masked_sad128x128 aom_masked_sad128x128_c
+ +
+void aom_masked_sad128x128x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[4], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[4]);
+#define aom_masked_sad128x128x4d aom_masked_sad128x128x4d_c
+
+unsigned int aom_masked_sad128x64_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask); +unsigned int aom_masked_sad128x64_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad128x64 aom_masked_sad128x64_c +#define aom_masked_sad128x64 aom_masked_sad128x64_c
+ +
+void aom_masked_sad128x64x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[4], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[4]);
+#define aom_masked_sad128x64x4d aom_masked_sad128x64x4d_c
+
+unsigned int aom_masked_sad16x16_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask); +unsigned int aom_masked_sad16x16_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad16x16 aom_masked_sad16x16_c +#define aom_masked_sad16x16 aom_masked_sad16x16_c
+ +
+void aom_masked_sad16x16x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[4], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[4]);
+#define aom_masked_sad16x16x4d aom_masked_sad16x16x4d_c
+
+unsigned int aom_masked_sad16x32_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask); +unsigned int aom_masked_sad16x32_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad16x32 aom_masked_sad16x32_c +#define aom_masked_sad16x32 aom_masked_sad16x32_c
+ +
+void aom_masked_sad16x32x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[4], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[4]);
+#define aom_masked_sad16x32x4d aom_masked_sad16x32x4d_c
+
+unsigned int aom_masked_sad16x8_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask); +unsigned int aom_masked_sad16x8_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad16x8 aom_masked_sad16x8_c +#define aom_masked_sad16x8 aom_masked_sad16x8_c
+ +
+void aom_masked_sad16x8x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[4], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[4]);
+#define aom_masked_sad16x8x4d aom_masked_sad16x8x4d_c
+
+unsigned int aom_masked_sad32x16_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask); +unsigned int aom_masked_sad32x16_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad32x16 aom_masked_sad32x16_c +#define aom_masked_sad32x16 aom_masked_sad32x16_c
+ +
+void aom_masked_sad32x16x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[4], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[4]);
+#define aom_masked_sad32x16x4d aom_masked_sad32x16x4d_c
+
+unsigned int aom_masked_sad32x32_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask); +unsigned int aom_masked_sad32x32_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad32x32 aom_masked_sad32x32_c +#define aom_masked_sad32x32 aom_masked_sad32x32_c
+ +
+void aom_masked_sad32x32x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[4], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[4]);
+#define aom_masked_sad32x32x4d aom_masked_sad32x32x4d_c
+
+unsigned int aom_masked_sad32x64_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask); +unsigned int aom_masked_sad32x64_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad32x64 aom_masked_sad32x64_c +#define aom_masked_sad32x64 aom_masked_sad32x64_c
+ +
+void aom_masked_sad32x64x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[4], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[4]);
+#define aom_masked_sad32x64x4d aom_masked_sad32x64x4d_c
+
+unsigned int aom_masked_sad4x4_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask); +unsigned int aom_masked_sad4x4_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad4x4 aom_masked_sad4x4_c +#define aom_masked_sad4x4 aom_masked_sad4x4_c
+ +
+void aom_masked_sad4x4x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[4], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[4]);
+#define aom_masked_sad4x4x4d aom_masked_sad4x4x4d_c
+
+unsigned int aom_masked_sad4x8_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask); +unsigned int aom_masked_sad4x8_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad4x8 aom_masked_sad4x8_c +#define aom_masked_sad4x8 aom_masked_sad4x8_c
+ +
+void aom_masked_sad4x8x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[4], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[4]);
+#define aom_masked_sad4x8x4d aom_masked_sad4x8x4d_c
+
+unsigned int aom_masked_sad64x128_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask); +unsigned int aom_masked_sad64x128_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad64x128 aom_masked_sad64x128_c +#define aom_masked_sad64x128 aom_masked_sad64x128_c
+ +
+void aom_masked_sad64x128x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[4], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[4]);
+#define aom_masked_sad64x128x4d aom_masked_sad64x128x4d_c
+
+unsigned int aom_masked_sad64x32_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask); +unsigned int aom_masked_sad64x32_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad64x32 aom_masked_sad64x32_c +#define aom_masked_sad64x32 aom_masked_sad64x32_c
+ +
+void aom_masked_sad64x32x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[4], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[4]);
+#define aom_masked_sad64x32x4d aom_masked_sad64x32x4d_c
+
+unsigned int aom_masked_sad64x64_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask); +unsigned int aom_masked_sad64x64_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad64x64 aom_masked_sad64x64_c +#define aom_masked_sad64x64 aom_masked_sad64x64_c
+ +
+void aom_masked_sad64x64x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[4], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[4]);
+#define aom_masked_sad64x64x4d aom_masked_sad64x64x4d_c
+
+unsigned int aom_masked_sad8x16_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask); +unsigned int aom_masked_sad8x16_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad8x16 aom_masked_sad8x16_c +#define aom_masked_sad8x16 aom_masked_sad8x16_c
+ +
+void aom_masked_sad8x16x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[4], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[4]);
+#define aom_masked_sad8x16x4d aom_masked_sad8x16x4d_c
+
+unsigned int aom_masked_sad8x4_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask); +unsigned int aom_masked_sad8x4_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad8x4 aom_masked_sad8x4_c +#define aom_masked_sad8x4 aom_masked_sad8x4_c
+ +
+void aom_masked_sad8x4x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[4], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[4]);
+#define aom_masked_sad8x4x4d aom_masked_sad8x4x4d_c
+
+unsigned int aom_masked_sad8x8_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask); +unsigned int aom_masked_sad8x8_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad8x8 aom_masked_sad8x8_c +#define aom_masked_sad8x8 aom_masked_sad8x8_c
+ +
+void aom_masked_sad8x8x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[4], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[4]);
+#define aom_masked_sad8x8x4d aom_masked_sad8x8x4d_c
+
+unsigned int aom_masked_sub_pixel_variance128x128_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse); +unsigned int aom_masked_sub_pixel_variance128x128_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance128x128 aom_masked_sub_pixel_variance128x128_c +#define aom_masked_sub_pixel_variance128x128 aom_masked_sub_pixel_variance128x128_c
+ +
@ -1766,11 +1725,22 @@ Index: chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/conf
+#endif +#endif
+ +
+#endif +#endif
Index: chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h Index: chromium-129.0.6668.42/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h +++ chromium-129.0.6668.42/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h
@@ -0,0 +1,107 @@ @@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2024, Alliance for Open Media. All rights reserved.
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+// This file is generated. Do not edit. +// This file is generated. Do not edit.
+#ifndef AOM_SCALE_RTCD_H_ +#ifndef AOM_SCALE_RTCD_H_
+#define AOM_SCALE_RTCD_H_ +#define AOM_SCALE_RTCD_H_
@ -1795,33 +1765,6 @@ Index: chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/conf
+void aom_extend_frame_borders_plane_row_c(const struct yv12_buffer_config *ybf, int plane, int v_start, int v_end); +void aom_extend_frame_borders_plane_row_c(const struct yv12_buffer_config *ybf, int plane, int v_start, int v_end);
+#define aom_extend_frame_borders_plane_row aom_extend_frame_borders_plane_row_c +#define aom_extend_frame_borders_plane_row aom_extend_frame_borders_plane_row_c
+ +
+void aom_extend_frame_borders_y_c(struct yv12_buffer_config *ybf);
+#define aom_extend_frame_borders_y aom_extend_frame_borders_y_c
+
+void aom_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf, const int num_planes);
+#define aom_extend_frame_inner_borders aom_extend_frame_inner_borders_c
+
+void aom_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
+#define aom_horizontal_line_2_1_scale aom_horizontal_line_2_1_scale_c
+
+void aom_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
+#define aom_horizontal_line_5_3_scale aom_horizontal_line_5_3_scale_c
+
+void aom_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
+#define aom_horizontal_line_5_4_scale aom_horizontal_line_5_4_scale_c
+
+void aom_vertical_band_2_1_scale_c(unsigned char *source, int src_pitch, unsigned char *dest, int dest_pitch, unsigned int dest_width);
+#define aom_vertical_band_2_1_scale aom_vertical_band_2_1_scale_c
+
+void aom_vertical_band_2_1_scale_i_c(unsigned char *source, int src_pitch, unsigned char *dest, int dest_pitch, unsigned int dest_width);
+#define aom_vertical_band_2_1_scale_i aom_vertical_band_2_1_scale_i_c
+
+void aom_vertical_band_5_3_scale_c(unsigned char *source, int src_pitch, unsigned char *dest, int dest_pitch, unsigned int dest_width);
+#define aom_vertical_band_5_3_scale aom_vertical_band_5_3_scale_c
+
+void aom_vertical_band_5_4_scale_c(unsigned char *source, int src_pitch, unsigned char *dest, int dest_pitch, unsigned int dest_width);
+#define aom_vertical_band_5_4_scale aom_vertical_band_5_4_scale_c
+
+void aom_yv12_copy_frame_c(const struct yv12_buffer_config *src_bc, struct yv12_buffer_config *dst_bc, const int num_planes); +void aom_yv12_copy_frame_c(const struct yv12_buffer_config *src_bc, struct yv12_buffer_config *dst_bc, const int num_planes);
+#define aom_yv12_copy_frame aom_yv12_copy_frame_c +#define aom_yv12_copy_frame aom_yv12_copy_frame_c
+ +
@ -1878,11 +1821,22 @@ Index: chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/conf
+#endif +#endif
+ +
+#endif +#endif
Index: chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h Index: chromium-129.0.6668.42/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h +++ chromium-129.0.6668.42/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h
@@ -0,0 +1,484 @@ @@ -0,0 +1,438 @@
+/*
+ * Copyright (c) 2024, Alliance for Open Media. All rights reserved.
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+// This file is generated. Do not edit. +// This file is generated. Do not edit.
+#ifndef AV1_RTCD_H_ +#ifndef AV1_RTCD_H_
+#define AV1_RTCD_H_ +#define AV1_RTCD_H_
@ -1967,12 +1921,6 @@ Index: chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/conf
+ int ref_stride, int subpel_search); + int ref_stride, int subpel_search);
+#define aom_comp_avg_upsampled_pred aom_comp_avg_upsampled_pred_c +#define aom_comp_avg_upsampled_pred aom_comp_avg_upsampled_pred_c
+ +
+void aom_dist_wtd_comp_avg_upsampled_pred_c(MACROBLOCKD *xd, const struct AV1Common *const cm, int mi_row, int mi_col,
+ const MV *const mv, uint8_t *comp_pred, const uint8_t *pred, int width,
+ int height, int subpel_x_q3, int subpel_y_q3, const uint8_t *ref,
+ int ref_stride, const DIST_WTD_COMP_PARAMS *jcp_param, int subpel_search);
+#define aom_dist_wtd_comp_avg_upsampled_pred aom_dist_wtd_comp_avg_upsampled_pred_c
+
+void aom_quantize_b_helper_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan, const qm_val_t *qm_ptr, const qm_val_t *iqm_ptr, const int log_scale); +void aom_quantize_b_helper_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan, const qm_val_t *qm_ptr, const qm_val_t *iqm_ptr, const int log_scale);
+#define aom_quantize_b_helper aom_quantize_b_helper_c +#define aom_quantize_b_helper aom_quantize_b_helper_c
+ +
@ -2050,6 +1998,9 @@ Index: chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/conf
+void av1_dr_prediction_z3_c(uint8_t *dst, ptrdiff_t stride, int bw, int bh, const uint8_t *above, const uint8_t *left, int upsample_left, int dx, int dy); +void av1_dr_prediction_z3_c(uint8_t *dst, ptrdiff_t stride, int bw, int bh, const uint8_t *above, const uint8_t *left, int upsample_left, int dx, int dy);
+#define av1_dr_prediction_z3 av1_dr_prediction_z3_c +#define av1_dr_prediction_z3 av1_dr_prediction_z3_c
+ +
+void av1_fdwt8x8_uint8_input_c(const uint8_t *input, tran_low_t *output, int stride, int hbd);
+#define av1_fdwt8x8_uint8_input av1_fdwt8x8_uint8_input_c
+
+void av1_filter_intra_edge_c(uint8_t *p, int sz, int strength); +void av1_filter_intra_edge_c(uint8_t *p, int sz, int strength);
+#define av1_filter_intra_edge av1_filter_intra_edge_c +#define av1_filter_intra_edge av1_filter_intra_edge_c
+ +
@ -2113,60 +2064,6 @@ Index: chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/conf
+void av1_highbd_inv_txfm_add_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param); +void av1_highbd_inv_txfm_add_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add av1_highbd_inv_txfm_add_c +#define av1_highbd_inv_txfm_add av1_highbd_inv_txfm_add_c
+ +
+void av1_highbd_inv_txfm_add_16x32_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_16x32 av1_highbd_inv_txfm_add_16x32_c
+
+void av1_highbd_inv_txfm_add_16x4_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_16x4 av1_highbd_inv_txfm_add_16x4_c
+
+void av1_highbd_inv_txfm_add_16x64_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_16x64 av1_highbd_inv_txfm_add_16x64_c
+
+void av1_highbd_inv_txfm_add_16x8_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_16x8 av1_highbd_inv_txfm_add_16x8_c
+
+void av1_highbd_inv_txfm_add_32x16_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_32x16 av1_highbd_inv_txfm_add_32x16_c
+
+void av1_highbd_inv_txfm_add_32x32_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_32x32 av1_highbd_inv_txfm_add_32x32_c
+
+void av1_highbd_inv_txfm_add_32x64_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_32x64 av1_highbd_inv_txfm_add_32x64_c
+
+void av1_highbd_inv_txfm_add_32x8_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_32x8 av1_highbd_inv_txfm_add_32x8_c
+
+void av1_highbd_inv_txfm_add_4x16_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_4x16 av1_highbd_inv_txfm_add_4x16_c
+
+void av1_highbd_inv_txfm_add_4x4_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_4x4 av1_highbd_inv_txfm_add_4x4_c
+
+void av1_highbd_inv_txfm_add_4x8_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_4x8 av1_highbd_inv_txfm_add_4x8_c
+
+void av1_highbd_inv_txfm_add_64x16_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_64x16 av1_highbd_inv_txfm_add_64x16_c
+
+void av1_highbd_inv_txfm_add_64x32_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_64x32 av1_highbd_inv_txfm_add_64x32_c
+
+void av1_highbd_inv_txfm_add_64x64_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_64x64 av1_highbd_inv_txfm_add_64x64_c
+
+void av1_highbd_inv_txfm_add_8x16_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_8x16 av1_highbd_inv_txfm_add_8x16_c
+
+void av1_highbd_inv_txfm_add_8x32_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_8x32 av1_highbd_inv_txfm_add_8x32_c
+
+void av1_highbd_inv_txfm_add_8x4_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_8x4 av1_highbd_inv_txfm_add_8x4_c
+
+void av1_highbd_inv_txfm_add_8x8_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_8x8 av1_highbd_inv_txfm_add_8x8_c
+
+void av1_highbd_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int bd); +void av1_highbd_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int bd);
+#define av1_highbd_iwht4x4_16_add av1_highbd_iwht4x4_16_add_c +#define av1_highbd_iwht4x4_16_add av1_highbd_iwht4x4_16_add_c
+ +
@ -2260,7 +2157,7 @@ Index: chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/conf
+void av1_resize_and_extend_frame_c(const YV12_BUFFER_CONFIG *src, YV12_BUFFER_CONFIG *dst, const InterpFilter filter, const int phase, const int num_planes); +void av1_resize_and_extend_frame_c(const YV12_BUFFER_CONFIG *src, YV12_BUFFER_CONFIG *dst, const InterpFilter filter, const int phase, const int num_planes);
+#define av1_resize_and_extend_frame av1_resize_and_extend_frame_c +#define av1_resize_and_extend_frame av1_resize_and_extend_frame_c
+ +
+void av1_resize_horz_dir_c(const uint8_t *const input, int in_stride, uint8_t *intbuf, int height, int filteredlength, int width2); +void av1_resize_horz_dir_c(const uint8_t *const input, int in_stride, uint8_t *intbuf, int height, int filtered_length, int width2);
+#define av1_resize_horz_dir av1_resize_horz_dir_c +#define av1_resize_horz_dir av1_resize_horz_dir_c
+ +
+bool av1_resize_vert_dir_c(uint8_t *intbuf, uint8_t *output, int out_stride, int height, int height2, int width2, int start_col); +bool av1_resize_vert_dir_c(uint8_t *intbuf, uint8_t *output, int out_stride, int height, int height2, int width2, int start_col);

@ -1,6 +1,6 @@
From 24fca3c63c8240c9e4214163947f71a404300ac1 Mon Sep 17 00:00:00 2001 From d809986ff97aad30883b88e24509172492cc0f33 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru> From: tigro <tigro@msvsphere-os.ru>
Date: Tue, 27 Aug 2024 14:43:09 +0300 Date: Thu, 19 Sep 2024 17:54:08 +0300
Subject: [PATCH] Added Yandex search bar as default on newtab and new-tab-page Subject: [PATCH] Added Yandex search bar as default on newtab and new-tab-page
--- ---
@ -26,14 +26,14 @@ Subject: [PATCH] Added Yandex search bar as default on newtab and new-tab-page
.../search_engines/search_engine_countries-inc.cc | 9 +++++---- .../search_engines/search_engine_countries-inc.cc | 9 +++++----
.../search_engines/template_url_data_util.cc | 6 +++++- .../search_engines/template_url_data_util.cc | 6 +++++-
.../template_url_prepopulate_data.cc | 9 ++++++++- .../template_url_prepopulate_data.cc | 9 ++++++++-
.../resources/cr_components/searchbox/realbox.html | 7 +++++++ .../cr_components/searchbox/searchbox.html | 7 +++++++
23 files changed, 88 insertions(+), 33 deletions(-) 23 files changed, 88 insertions(+), 33 deletions(-)
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 366de3cb51..f1b7148608 100644 index 0b811678f9..6ae1ae2aff 100644
--- a/chrome/app/generated_resources.grd --- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd
@@ -7742,10 +7742,8 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -7801,10 +7801,8 @@ Keep your key file in a safe place. You will need it to create new versions of y
<!-- NTP --> <!-- NTP -->
<message name="IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_MD" desc="The text displayed in the fakebox (on the New Tab page) when it is empty, Google is the default search engine, and the Material Design UI is enabled."> <message name="IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_MD" desc="The text displayed in the fakebox (on the New Tab page) when it is empty, Google is the default search engine, and the Material Design UI is enabled.">
@ -45,10 +45,10 @@ index 366de3cb51..f1b7148608 100644
<message name="IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_MULTIMODAL" desc="The text displayed in the multimodal searchbox when it is empty. It is meant to invite the user to add a text query to the existing image query in order to issue a 'multimodal' (image + text) query."> <message name="IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_MULTIMODAL" desc="The text displayed in the multimodal searchbox when it is empty. It is meant to invite the user to add a text query to the existing image query in order to issue a 'multimodal' (image + text) query.">
Add to your search Add to your search
diff --git a/chrome/app/resources/generated_resources_be.xtb b/chrome/app/resources/generated_resources_be.xtb diff --git a/chrome/app/resources/generated_resources_be.xtb b/chrome/app/resources/generated_resources_be.xtb
index cf57c86031..5c700fad3d 100644 index dc1ef8e2d3..19f0a2a73d 100644
--- a/chrome/app/resources/generated_resources_be.xtb --- a/chrome/app/resources/generated_resources_be.xtb
+++ b/chrome/app/resources/generated_resources_be.xtb +++ b/chrome/app/resources/generated_resources_be.xtb
@@ -9669,7 +9669,7 @@ @@ -9739,7 +9739,7 @@
<translation id="8048728378294435881">Стварайце рэзервовыя копіі сваіх даных, каб іх можна было выкарыстоўваць на іншых прыладах</translation> <translation id="8048728378294435881">Стварайце рэзервовыя копіі сваіх даных, каб іх можна было выкарыстоўваць на іншых прыладах</translation>
<translation id="8048977114738515028">Стварыце ярлык на працоўным стале прылады, каб мець прамы доступ да гэтага профілю</translation> <translation id="8048977114738515028">Стварыце ярлык на працоўным стале прылады, каб мець прамы доступ да гэтага профілю</translation>
<translation id="8049029041626250638">Падключыце клавіятуру або мыш. Калі вы выкарыстоўваеце прылады з Bluetooth, упэўніцеся, што яны гатовыя да спалучэння.</translation> <translation id="8049029041626250638">Падключыце клавіятуру або мыш. Калі вы выкарыстоўваеце прылады з Bluetooth, упэўніцеся, што яны гатовыя да спалучэння.</translation>
@ -57,7 +57,7 @@ index cf57c86031..5c700fad3d 100644
<translation id="8049705080247101012">У Google пашырэнне "<ph name="EXTENSION_NAME" />" абазначана як шкоднае. Яго ўсталяванне было прадухілена</translation> <translation id="8049705080247101012">У Google пашырэнне "<ph name="EXTENSION_NAME" />" абазначана як шкоднае. Яго ўсталяванне было прадухілена</translation>
<translation id="8049948037269924837">Адваротная прагортка сэнсарнай панэллю</translation> <translation id="8049948037269924837">Адваротная прагортка сэнсарнай панэллю</translation>
<translation id="8050038245906040378">Камерцыйнае падпісванне кода ў Microsoft</translation> <translation id="8050038245906040378">Камерцыйнае падпісванне кода ў Microsoft</translation>
@@ -11412,4 +11412,4 @@ @@ -11493,4 +11493,4 @@
<translation id="997143476478634194">Пры наведванні сайтаў яны будуць аўтаматычна ўлічваць гэту наладу. Звычайна сайты адпраўляюць апавяшчэнні, каб паведаміць вам пра экстранныя навіны або новыя паведамленні ў чаце.</translation> <translation id="997143476478634194">Пры наведванні сайтаў яны будуць аўтаматычна ўлічваць гэту наладу. Звычайна сайты адпраўляюць апавяшчэнні, каб паведаміць вам пра экстранныя навіны або новыя паведамленні ў чаце.</translation>
<translation id="99731366405731005">Каб выкарыстоўваць функцыю сінхранізацыі параметраў Wi-Fi, уключыце <ph name="LINK1_BEGIN" />Сінхранізацыю Chrome<ph name="LINK1_END" />. <ph name="LINK2_BEGIN" />Даведацца больш<ph name="LINK2_END" /></translation> <translation id="99731366405731005">Каб выкарыстоўваць функцыю сінхранізацыі параметраў Wi-Fi, уключыце <ph name="LINK1_BEGIN" />Сінхранізацыю Chrome<ph name="LINK1_END" />. <ph name="LINK2_BEGIN" />Даведацца больш<ph name="LINK2_END" /></translation>
<translation id="998747458861718449">Пра&amp;верыць</translation> <translation id="998747458861718449">Пра&amp;верыць</translation>
@ -65,10 +65,10 @@ index cf57c86031..5c700fad3d 100644
\ No newline at end of file \ No newline at end of file
+</translationbundle> +</translationbundle>
diff --git a/chrome/app/resources/generated_resources_en-GB.xtb b/chrome/app/resources/generated_resources_en-GB.xtb diff --git a/chrome/app/resources/generated_resources_en-GB.xtb b/chrome/app/resources/generated_resources_en-GB.xtb
index c637034755..94eb5e6a86 100644 index ad55faedf2..ef54e4ae6a 100644
--- a/chrome/app/resources/generated_resources_en-GB.xtb --- a/chrome/app/resources/generated_resources_en-GB.xtb
+++ b/chrome/app/resources/generated_resources_en-GB.xtb +++ b/chrome/app/resources/generated_resources_en-GB.xtb
@@ -9680,7 +9680,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -9750,7 +9750,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
<translation id="8048728378294435881">Back up your stuff and use it on any device</translation> <translation id="8048728378294435881">Back up your stuff and use it on any device</translation>
<translation id="8048977114738515028">Create a desktop shortcut on your device to access directly to this profile</translation> <translation id="8048977114738515028">Create a desktop shortcut on your device to access directly to this profile</translation>
<translation id="8049029041626250638">Connect a keyboard or mouse. If you are using Bluetooth devices, make sure that your devices are ready to pair.</translation> <translation id="8049029041626250638">Connect a keyboard or mouse. If you are using Bluetooth devices, make sure that your devices are ready to pair.</translation>
@ -78,10 +78,10 @@ index c637034755..94eb5e6a86 100644
<translation id="8049948037269924837">Touchpad reverse scrolling</translation> <translation id="8049948037269924837">Touchpad reverse scrolling</translation>
<translation id="8050038245906040378">Microsoft Commercial Code Signing</translation> <translation id="8050038245906040378">Microsoft Commercial Code Signing</translation>
diff --git a/chrome/app/resources/generated_resources_ru.xtb b/chrome/app/resources/generated_resources_ru.xtb diff --git a/chrome/app/resources/generated_resources_ru.xtb b/chrome/app/resources/generated_resources_ru.xtb
index 759b1346db..27e6f4b72c 100644 index aef4319f47..a71919868f 100644
--- a/chrome/app/resources/generated_resources_ru.xtb --- a/chrome/app/resources/generated_resources_ru.xtb
+++ b/chrome/app/resources/generated_resources_ru.xtb +++ b/chrome/app/resources/generated_resources_ru.xtb
@@ -9673,7 +9673,7 @@ @@ -9743,7 +9743,7 @@
<translation id="8048728378294435881">Создайте резервную копию данных и используйте их на любом устройстве.</translation> <translation id="8048728378294435881">Создайте резервную копию данных и используйте их на любом устройстве.</translation>
<translation id="8048977114738515028">Чтобы быстро переключаться на этот профиль, создайте ярлык на рабочем столе</translation> <translation id="8048977114738515028">Чтобы быстро переключаться на этот профиль, создайте ярлык на рабочем столе</translation>
<translation id="8049029041626250638">Подключите мышь или клавиатуру. Если вы используете устройства Bluetooth, убедитесь, что они готовы к подключению.</translation> <translation id="8049029041626250638">Подключите мышь или клавиатуру. Если вы используете устройства Bluetooth, убедитесь, что они готовы к подключению.</translation>
@ -91,10 +91,10 @@ index 759b1346db..27e6f4b72c 100644
<translation id="8049948037269924837">Обратное направление прокрутки с помощью сенсорной панели</translation> <translation id="8049948037269924837">Обратное направление прокрутки с помощью сенсорной панели</translation>
<translation id="8050038245906040378">Подписывание коммерческого кода Microsoft</translation> <translation id="8050038245906040378">Подписывание коммерческого кода Microsoft</translation>
diff --git a/chrome/app/resources/generated_resources_uk.xtb b/chrome/app/resources/generated_resources_uk.xtb diff --git a/chrome/app/resources/generated_resources_uk.xtb b/chrome/app/resources/generated_resources_uk.xtb
index 34039a1a6d..84b33f4e51 100644 index e0781f8153..49a9e5008c 100644
--- a/chrome/app/resources/generated_resources_uk.xtb --- a/chrome/app/resources/generated_resources_uk.xtb
+++ b/chrome/app/resources/generated_resources_uk.xtb +++ b/chrome/app/resources/generated_resources_uk.xtb
@@ -9683,7 +9683,7 @@ @@ -9753,7 +9753,7 @@
<translation id="8048728378294435881">Створюйте резервні копії даних і використовуйте їх на будь-якому пристрої</translation> <translation id="8048728378294435881">Створюйте резервні копії даних і використовуйте їх на будь-якому пристрої</translation>
<translation id="8048977114738515028">Створити ярлик на робочому столі, щоб відразу переходити до цього профілю</translation> <translation id="8048977114738515028">Створити ярлик на робочому столі, щоб відразу переходити до цього профілю</translation>
<translation id="8049029041626250638">Підключіть клавіатуру або мишу. Якщо ви користуєтеся пристроями з Bluetooth, переконайтеся, що вони готові до підключення.</translation> <translation id="8049029041626250638">Підключіть клавіатуру або мишу. Якщо ви користуєтеся пристроями з Bluetooth, переконайтеся, що вони готові до підключення.</translation>
@ -104,10 +104,10 @@ index 34039a1a6d..84b33f4e51 100644
<translation id="8049948037269924837">Зворотне прокручування на сенсорній панелі</translation> <translation id="8049948037269924837">Зворотне прокручування на сенсорній панелі</translation>
<translation id="8050038245906040378">Підписування комерційного коду Microsoft</translation> <translation id="8050038245906040378">Підписування комерційного коду Microsoft</translation>
diff --git a/chrome/browser/history/top_sites_factory.cc b/chrome/browser/history/top_sites_factory.cc diff --git a/chrome/browser/history/top_sites_factory.cc b/chrome/browser/history/top_sites_factory.cc
index 0da9ce7baf..7ade1ebfe1 100644 index cd1caf3f41..5f0b99b14f 100644
--- a/chrome/browser/history/top_sites_factory.cc --- a/chrome/browser/history/top_sites_factory.cc
+++ b/chrome/browser/history/top_sites_factory.cc +++ b/chrome/browser/history/top_sites_factory.cc
@@ -54,7 +54,7 @@ struct RawPrepopulatedPage { @@ -59,7 +59,7 @@ struct RawPrepopulatedPage {
// roughly match favicon). // roughly match favicon).
}; };
@ -116,7 +116,7 @@ index 0da9ce7baf..7ade1ebfe1 100644
// Android does not use prepopulated pages. // Android does not use prepopulated pages.
const RawPrepopulatedPage kRawPrepopulatedPages[] = { const RawPrepopulatedPage kRawPrepopulatedPages[] = {
{ {
@@ -69,7 +69,7 @@ const RawPrepopulatedPage kRawPrepopulatedPages[] = { @@ -74,7 +74,7 @@ const RawPrepopulatedPage kRawPrepopulatedPages[] = {
void InitializePrepopulatedPageList( void InitializePrepopulatedPageList(
Profile* profile, Profile* profile,
history::PrepopulatedPageList* prepopulated_pages) { history::PrepopulatedPageList* prepopulated_pages) {
@ -232,7 +232,7 @@ index 412c9bcf2c..e0c27819a5 100644
private computeShowDoodle_(): boolean { private computeShowDoodle_(): boolean {
diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
index 916e1c043f..652c01e92d 100644 index 40c586fb4f..fc046edf27 100644
--- a/chrome/browser/search/search.cc --- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc +++ b/chrome/browser/search/search.cc
@@ -174,6 +174,8 @@ struct NewTabURLDetails { @@ -174,6 +174,8 @@ struct NewTabURLDetails {
@ -270,10 +270,10 @@ index c7ae65114f..5859d72731 100644
bool IsNTPOrRelatedURL(const GURL& url, Profile* profile); bool IsNTPOrRelatedURL(const GURL& url, Profile* profile);
diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
index b3304b0757..33e6a2fd41 100644 index 2d64a60614..2785307858 100644
--- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc --- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
+++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc +++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
@@ -32,6 +32,7 @@ @@ -37,6 +37,7 @@
#include "chrome/browser/search/background/ntp_custom_background_service_factory.h" #include "chrome/browser/search/background/ntp_custom_background_service_factory.h"
#include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/search_provider_logos/logo_service_factory.h" #include "chrome/browser/search_provider_logos/logo_service_factory.h"
@ -281,9 +281,9 @@ index b3304b0757..33e6a2fd41 100644
#include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/browser/sync/sync_service_factory.h" #include "chrome/browser/sync/sync_service_factory.h"
#include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/themes/theme_service_factory.h"
@@ -421,6 +422,10 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) { @@ -424,6 +425,10 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) {
base::NumberToString(
source->AddBoolean("modulesRedesignedEnabled", redesigned_modules_enabled); ntp_features::kNtpCalendarModuleWindowEndDeltaParam.Get().InHours()));
+ source->AddBoolean( + source->AddBoolean(
+ "googleLensForYandex", + "googleLensForYandex",
@ -358,10 +358,10 @@ index d4f6038697..b493d4c587 100644
data->suggestions_url_post_params = s.ColumnString(18); data->suggestions_url_post_params = s.ColumnString(18);
data->image_url_post_params = s.ColumnString(19); data->image_url_post_params = s.ColumnString(19);
diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
index 889d15f789..eb41d59f3c 100644 index 2dc4ac1f5d..292de3e3e5 100644
--- a/components/search_engines/prepopulated_engines.json --- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json +++ b/components/search_engines/prepopulated_engines.json
@@ -673,7 +673,7 @@ @@ -675,7 +675,7 @@
"suggest_url": "https://suggest.yandex.by/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.by/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.by/images/search/?rpt=imageview", "image_url": "https://yandex.by/images/search/?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -370,7 +370,7 @@ index 889d15f789..eb41d59f3c 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -686,6 +686,7 @@ @@ -688,6 +688,7 @@
"suggest_url": "https://suggest.yandex.com/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}&uil=en&v=3&sn=5", "suggest_url": "https://suggest.yandex.com/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}&uil=en&v=3&sn=5",
"image_url": "https://yandex.com/images/search?rpt=imageview", "image_url": "https://yandex.com/images/search?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -378,7 +378,7 @@ index 889d15f789..eb41d59f3c 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -699,7 +700,7 @@ @@ -701,7 +702,7 @@
"suggest_url": "https://suggest.yandex.kz/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.kz/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.kz/images/search/?rpt=imageview", "image_url": "https://yandex.kz/images/search/?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -387,7 +387,7 @@ index 889d15f789..eb41d59f3c 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -713,7 +714,7 @@ @@ -715,7 +716,7 @@
"suggest_url": "https://suggest.yandex.ru/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.ru/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.ru/images/search/?rpt=imageview", "image_url": "https://yandex.ru/images/search/?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -396,7 +396,7 @@ index 889d15f789..eb41d59f3c 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -726,7 +727,7 @@ @@ -728,7 +729,7 @@
"suggest_url": "https://suggest.yandex.com.tr/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.com.tr/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.com.tr/gorsel/search?rpt=imageview", "image_url": "https://yandex.com.tr/gorsel/search?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -405,7 +405,7 @@ index 889d15f789..eb41d59f3c 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -740,7 +741,7 @@ @@ -742,7 +743,7 @@
"suggest_url": "https://suggest.yandex.ua/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.ua/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.ua/images/search/?rpt=imageview", "image_url": "https://yandex.ua/images/search/?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -415,10 +415,10 @@ index 889d15f789..eb41d59f3c 100644
"id": 15 "id": 15
}, },
diff --git a/components/search_engines/search_engine_countries-inc.cc b/components/search_engines/search_engine_countries-inc.cc diff --git a/components/search_engines/search_engine_countries-inc.cc b/components/search_engines/search_engine_countries-inc.cc
index 6c8ffb9e7d..417cb0009c 100644 index 468d6ca0ef..029c2c2966 100644
--- a/components/search_engines/search_engine_countries-inc.cc --- a/components/search_engines/search_engine_countries-inc.cc
+++ b/components/search_engines/search_engine_countries-inc.cc +++ b/components/search_engines/search_engine_countries-inc.cc
@@ -33,6 +33,7 @@ struct EngineAndTier { @@ -38,6 +38,7 @@ struct EngineAndTier {
// Default (for countries with no better engine set) // Default (for countries with no better engine set)
constexpr EngineAndTier engines_default[] = { constexpr EngineAndTier engines_default[] = {
@ -426,7 +426,7 @@ index 6c8ffb9e7d..417cb0009c 100644
{SearchEngineTier::kTopEngines, &google}, {SearchEngineTier::kTopEngines, &google},
{SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &bing},
{SearchEngineTier::kTopEngines, &yahoo}, {SearchEngineTier::kTopEngines, &yahoo},
@@ -169,8 +170,8 @@ constexpr EngineAndTier engines_BR[] = { @@ -174,8 +175,8 @@ constexpr EngineAndTier engines_BR[] = {
// Belarus // Belarus
constexpr EngineAndTier engines_BY[] = { constexpr EngineAndTier engines_BY[] = {
@ -436,7 +436,7 @@ index 6c8ffb9e7d..417cb0009c 100644
{SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &bing},
{SearchEngineTier::kTopEngines, &duckduckgo}, {SearchEngineTier::kTopEngines, &duckduckgo},
{SearchEngineTier::kTopEngines, &mail_ru}, {SearchEngineTier::kTopEngines, &mail_ru},
@@ -494,9 +495,9 @@ constexpr EngineAndTier engines_IN[] = { @@ -499,9 +500,9 @@ constexpr EngineAndTier engines_IN[] = {
// Iraq // Iraq
constexpr EngineAndTier engines_IQ[] = { constexpr EngineAndTier engines_IQ[] = {
@ -447,7 +447,7 @@ index 6c8ffb9e7d..417cb0009c 100644
{SearchEngineTier::kTopEngines, &yahoo}, {SearchEngineTier::kTopEngines, &yahoo},
{SearchEngineTier::kTopEngines, &duckduckgo}, {SearchEngineTier::kTopEngines, &duckduckgo},
}; };
@@ -590,8 +591,8 @@ constexpr EngineAndTier engines_KW[] = { @@ -595,8 +596,8 @@ constexpr EngineAndTier engines_KW[] = {
// Kazakhstan // Kazakhstan
constexpr EngineAndTier engines_KZ[] = { constexpr EngineAndTier engines_KZ[] = {
@ -457,7 +457,7 @@ index 6c8ffb9e7d..417cb0009c 100644
{SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &bing},
{SearchEngineTier::kTopEngines, &mail_ru}, {SearchEngineTier::kTopEngines, &mail_ru},
{SearchEngineTier::kTopEngines, &yahoo}, {SearchEngineTier::kTopEngines, &yahoo},
@@ -1007,8 +1008,8 @@ constexpr EngineAndTier engines_TN[] = { @@ -1012,8 +1013,8 @@ constexpr EngineAndTier engines_TN[] = {
// Turkey // Turkey
constexpr EngineAndTier engines_TR[] = { constexpr EngineAndTier engines_TR[] = {
@ -468,10 +468,10 @@ index 6c8ffb9e7d..417cb0009c 100644
{SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &bing},
{SearchEngineTier::kTopEngines, &duckduckgo}, {SearchEngineTier::kTopEngines, &duckduckgo},
diff --git a/components/search_engines/template_url_data_util.cc b/components/search_engines/template_url_data_util.cc diff --git a/components/search_engines/template_url_data_util.cc b/components/search_engines/template_url_data_util.cc
index 6f85515188..0657dc9d5a 100644 index c6e259ad74..1a2b5e2114 100644
--- a/components/search_engines/template_url_data_util.cc --- a/components/search_engines/template_url_data_util.cc
+++ b/components/search_engines/template_url_data_util.cc +++ b/components/search_engines/template_url_data_util.cc
@@ -75,10 +75,12 @@ std::unique_ptr<TemplateURLData> TemplateURLDataFromDictionary( @@ -80,10 +80,12 @@ std::unique_ptr<TemplateURLData> TemplateURLDataFromDictionary(
if (string_value) { if (string_value) {
result->image_translate_url = *string_value; result->image_translate_url = *string_value;
} }
@ -484,7 +484,7 @@ index 6f85515188..0657dc9d5a 100644
string_value = dict.FindString(DefaultSearchManager::kContextualSearchURL); string_value = dict.FindString(DefaultSearchManager::kContextualSearchURL);
if (string_value) { if (string_value) {
result->contextual_search_url = *string_value; result->contextual_search_url = *string_value;
@@ -347,7 +349,7 @@ std::unique_ptr<TemplateURLData> TemplateURLDataFromPrepopulatedEngine( @@ -352,7 +354,7 @@ std::unique_ptr<TemplateURLData> TemplateURLDataFromPrepopulatedEngine(
ToStringPiece(engine.search_url), ToStringPiece(engine.suggest_url), ToStringPiece(engine.search_url), ToStringPiece(engine.suggest_url),
ToStringPiece(engine.image_url), ToStringPiece(engine.image_url),
ToStringPiece(engine.image_translate_url), ToStringPiece(engine.image_translate_url),
@ -493,7 +493,7 @@ index 6f85515188..0657dc9d5a 100644
ToStringPiece(engine.contextual_search_url), ToStringPiece(engine.contextual_search_url),
ToStringPiece(engine.logo_url), ToStringPiece(engine.doodle_url), ToStringPiece(engine.logo_url), ToStringPiece(engine.doodle_url),
ToStringPiece(engine.search_url_post_params), ToStringPiece(engine.search_url_post_params),
@@ -438,10 +440,12 @@ std::unique_ptr<TemplateURLData> TemplateURLDataFromOverrideDictionary( @@ -444,10 +446,12 @@ std::unique_ptr<TemplateURLData> TemplateURLDataFromOverrideDictionary(
if (string_value) { if (string_value) {
image_translate_url = *string_value; image_translate_url = *string_value;
} }
@ -507,10 +507,10 @@ index 6f85515188..0657dc9d5a 100644
if (string_value) { if (string_value) {
contextual_search_url = *string_value; contextual_search_url = *string_value;
diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
index 964626cc24..d4d09dc1bd 100644 index ca355f2b9c..170f14b3dd 100644
--- a/components/search_engines/template_url_prepopulate_data.cc --- a/components/search_engines/template_url_prepopulate_data.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc +++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -81,6 +81,13 @@ GetPrepopulatedEnginesForEeaRegionCountries(int country_id, @@ -86,6 +86,13 @@ GetPrepopulatedEnginesForEeaRegionCountries(int country_id,
std::shuffle(t_urls.begin(), t_urls.end(), generator); std::shuffle(t_urls.begin(), t_urls.end(), generator);
CHECK_LE(t_urls.size(), kMaxEeaPrepopulatedEngines); CHECK_LE(t_urls.size(), kMaxEeaPrepopulatedEngines);
@ -524,7 +524,7 @@ index 964626cc24..d4d09dc1bd 100644
return t_urls; return t_urls;
} }
@@ -323,7 +330,7 @@ std::unique_ptr<TemplateURLData> GetPrepopulatedFallbackSearch( @@ -328,7 +335,7 @@ std::unique_ptr<TemplateURLData> GetPrepopulatedFallbackSearch(
PrefService* prefs, PrefService* prefs,
search_engines::SearchEngineChoiceService* search_engine_choice_service) { search_engines::SearchEngineChoiceService* search_engine_choice_service) {
return FindPrepopulatedEngineInternal(prefs, search_engine_choice_service, return FindPrepopulatedEngineInternal(prefs, search_engine_choice_service,
@ -533,10 +533,10 @@ index 964626cc24..d4d09dc1bd 100644
/*use_first_as_fallback=*/true); /*use_first_as_fallback=*/true);
} }
diff --git a/ui/webui/resources/cr_components/searchbox/realbox.html b/ui/webui/resources/cr_components/searchbox/realbox.html diff --git a/ui/webui/resources/cr_components/searchbox/searchbox.html b/ui/webui/resources/cr_components/searchbox/searchbox.html
index 6dce798dcc..0f6ee046fb 100644 index 8c88f273b9..d5187f33c0 100644
--- a/ui/webui/resources/cr_components/searchbox/realbox.html --- a/ui/webui/resources/cr_components/searchbox/searchbox.html
+++ b/ui/webui/resources/cr_components/searchbox/realbox.html +++ b/ui/webui/resources/cr_components/searchbox/searchbox.html
@@ -1,4 +1,11 @@ @@ -1,4 +1,11 @@
<style include="cr-icons"> <style include="cr-icons">
+ #voiceSearchButton { + #voiceSearchButton {

@ -40,20 +40,16 @@ This patch implements support for the PPC64 architecture on Linux hosts.
util/misc/capture_context_test_util_linux.cc | 6 + util/misc/capture_context_test_util_linux.cc | 6 +
36 files changed, 932 insertions(+), 12 deletions(-) 36 files changed, 932 insertions(+), 12 deletions(-)
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/CONTRIBUTORS --- a/third_party/crashpad/crashpad/CONTRIBUTORS
=================================================================== +++ b/third_party/crashpad/crashpad/CONTRIBUTORS
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/CONTRIBUTORS
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/CONTRIBUTORS
@@ -13,3 +13,5 @@ Mark Mentovai <mark@chromium.org> @@ -13,3 +13,5 @@ Mark Mentovai <mark@chromium.org>
Robert Sesek <rsesek@chromium.org> Robert Sesek <rsesek@chromium.org>
Scott Graham <scottmg@chromium.org> Scott Graham <scottmg@chromium.org>
Joshua Peraza <jperaza@chromium.org> Joshua Peraza <jperaza@chromium.org>
+Shawn Anastasio <sanastasio@raptorengineering.com> +Shawn Anastasio <sanastasio@raptorengineering.com>
+Timothy Pearson <tpearson@raptorengineering.com> +Timothy Pearson <tpearson@raptorengineering.com>
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/minidump_context.h --- a/third_party/crashpad/crashpad/minidump/minidump_context.h
=================================================================== +++ b/third_party/crashpad/crashpad/minidump/minidump_context.h
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/minidump/minidump_context.h
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/minidump_context.h
@@ -687,6 +687,70 @@ struct MinidumpContextRISCV64 { @@ -687,6 +687,70 @@ struct MinidumpContextRISCV64 {
uint32_t fcsr; uint32_t fcsr;
}; };
@ -125,10 +121,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/minidump_c
} // namespace crashpad } // namespace crashpad
#endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_ #endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc --- a/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
=================================================================== +++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
@@ -110,6 +110,13 @@ MinidumpContextWriter::CreateFromSnapsho @@ -110,6 +110,13 @@ MinidumpContextWriter::CreateFromSnapsho
break; break;
} }
@ -192,10 +186,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/minidump_c
+} +}
} // namespace crashpad } // namespace crashpad
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/minidump_context_writer.h --- a/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
=================================================================== +++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
@@ -413,6 +413,49 @@ class MinidumpContextRISCV64Writer final @@ -413,6 +413,49 @@ class MinidumpContextRISCV64Writer final
MinidumpContextRISCV64 context_; MinidumpContextRISCV64 context_;
}; };
@ -246,11 +238,9 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/minidump_c
} // namespace crashpad } // namespace crashpad
#endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_ #endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc --- a/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
=================================================================== +++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc @@ -322,6 +322,21 @@ TYPED_TEST(MinidumpContextWriter, RISCV6
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
@@ -328,6 +328,21 @@ TYPED_TEST(MinidumpContextWriter, RISCV6
TypeParam>(context, ExpectMinidumpContextRISCV64, kSeed); TypeParam>(context, ExpectMinidumpContextRISCV64, kSeed);
} }
@ -272,10 +262,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/minidump_c
} // namespace } // namespace
} // namespace test } // namespace test
} // namespace crashpad } // namespace crashpad
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc --- a/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
=================================================================== +++ b/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
@@ -177,6 +177,8 @@ std::string MinidumpMiscInfoDebugBuildSt @@ -177,6 +177,8 @@ std::string MinidumpMiscInfoDebugBuildSt
static constexpr char kCPU[] = "mips64"; static constexpr char kCPU[] = "mips64";
#elif defined(ARCH_CPU_RISCV64) #elif defined(ARCH_CPU_RISCV64)
@ -285,10 +273,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/minidump_m
#else #else
#error define kCPU for this CPU #error define kCPU for this CPU
#endif #endif
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc --- a/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc
=================================================================== +++ b/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc
@@ -297,6 +297,40 @@ void InitializeMinidumpContextRISCV64(Mi @@ -297,6 +297,40 @@ void InitializeMinidumpContextRISCV64(Mi
context->fcsr = value++; context->fcsr = value++;
} }
@ -369,10 +355,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/test/minid
+ +
} // namespace test } // namespace test
} // namespace crashpad } // namespace crashpad
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h --- a/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h
=================================================================== +++ b/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h
@@ -90,6 +90,9 @@ void ExpectMinidumpContextMIPS64(uint32_ @@ -90,6 +90,9 @@ void ExpectMinidumpContextMIPS64(uint32_
void ExpectMinidumpContextRISCV64(uint32_t expect_seed, void ExpectMinidumpContextRISCV64(uint32_t expect_seed,
const MinidumpContextRISCV64* observed, const MinidumpContextRISCV64* observed,
@ -383,10 +367,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/minidump/test/minid
//! \} //! \}
} // namespace test } // namespace test
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/capture_memory.cc --- a/third_party/crashpad/crashpad/snapshot/capture_memory.cc
=================================================================== +++ b/third_party/crashpad/crashpad/snapshot/capture_memory.cc
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/capture_memory.cc
@@ -123,6 +123,11 @@ void CaptureMemory::PointedToByContext(c @@ -123,6 +123,11 @@ void CaptureMemory::PointedToByContext(c
for (size_t i = 0; i < std::size(context.riscv64->regs); ++i) { for (size_t i = 0; i < std::size(context.riscv64->regs); ++i) {
MaybeCaptureMemoryAround(delegate, context.riscv64->regs[i]); MaybeCaptureMemoryAround(delegate, context.riscv64->regs[i]);
@ -399,10 +381,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/capture_me
#else #else
#error Port. #error Port.
#endif #endif
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/cpu_architecture.h --- a/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
=================================================================== +++ b/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
@@ -47,6 +47,9 @@ enum CPUArchitecture { @@ -47,6 +47,9 @@ enum CPUArchitecture {
//! \brief 64-bit RISC-V. //! \brief 64-bit RISC-V.
@ -413,10 +393,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/cpu_archit
}; };
} // namespace crashpad } // namespace crashpad
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/cpu_context.cc --- a/third_party/crashpad/crashpad/snapshot/cpu_context.cc
=================================================================== +++ b/third_party/crashpad/crashpad/snapshot/cpu_context.cc
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/cpu_context.cc
@@ -173,6 +173,8 @@ uint64_t CPUContext::InstructionPointer( @@ -173,6 +173,8 @@ uint64_t CPUContext::InstructionPointer(
return arm64->pc; return arm64->pc;
case kCPUArchitectureRISCV64: case kCPUArchitectureRISCV64:
@ -424,18 +402,18 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/cpu_contex
+ case kCPUArchitecturePPC64: + case kCPUArchitecturePPC64:
+ return ppc64->nip; + return ppc64->nip;
default: default:
NOTREACHED_IN_MIGRATION(); NOTREACHED();
return ~0ull; }
@@ -191,6 +193,8 @@ uint64_t CPUContext::StackPointer() cons @@ -190,6 +192,8 @@ uint64_t CPUContext::StackPointer() cons
return arm64->sp; return arm64->sp;
case kCPUArchitectureRISCV64: case kCPUArchitectureRISCV64:
return riscv64->regs[1]; return riscv64->regs[1];
+ case kCPUArchitecturePPC64: + case kCPUArchitecturePPC64:
+ return ppc64->regs[1]; + return ppc64->regs[1];
default: default:
NOTREACHED_IN_MIGRATION(); NOTREACHED();
return ~0ull; }
@@ -231,6 +235,7 @@ bool CPUContext::Is64Bit() const { @@ -226,6 +230,7 @@ bool CPUContext::Is64Bit() const {
case kCPUArchitectureX86_64: case kCPUArchitectureX86_64:
case kCPUArchitectureARM64: case kCPUArchitectureARM64:
case kCPUArchitectureMIPS64EL: case kCPUArchitectureMIPS64EL:
@ -443,10 +421,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/cpu_contex
case kCPUArchitectureRISCV64: case kCPUArchitectureRISCV64:
return true; return true;
case kCPUArchitectureX86: case kCPUArchitectureX86:
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/cpu_context.h --- a/third_party/crashpad/crashpad/snapshot/cpu_context.h
=================================================================== +++ b/third_party/crashpad/crashpad/snapshot/cpu_context.h
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/snapshot/cpu_context.h
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/cpu_context.h
@@ -371,6 +371,24 @@ struct CPUContextRISCV64 { @@ -371,6 +371,24 @@ struct CPUContextRISCV64 {
uint32_t fcsr; uint32_t fcsr;
}; };
@ -480,10 +456,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/cpu_contex
}; };
}; };
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h --- a/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
=================================================================== +++ b/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
#ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
#define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
@ -571,10 +545,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/cpu_
} // namespace internal } // namespace internal
} // namespace crashpad } // namespace crashpad
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc --- a/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
=================================================================== +++ b/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
@@ -194,12 +194,15 @@ void TestAgainstTarget(PtraceConnection* @@ -194,12 +194,15 @@ void TestAgainstTarget(PtraceConnection*
device == 0 && inode == 0 && mapping_name == "[vdso]"; device == 0 && inode == 0 && mapping_name == "[vdso]";
#if defined(ARCH_CPU_X86) #if defined(ARCH_CPU_X86)
@ -592,10 +564,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/debu
}, },
module_mapping->name, module_mapping->name,
module_mapping->device, module_mapping->device,
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc --- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
=================================================================== +++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
@@ -367,6 +367,69 @@ bool ExceptionSnapshotLinux::ReadContext @@ -367,6 +367,69 @@ bool ExceptionSnapshotLinux::ReadContext
return internal::ReadContext(reader, context_address, context_.riscv64); return internal::ReadContext(reader, context_address, context_.riscv64);
} }
@ -666,10 +636,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/exce
#endif // ARCH_CPU_X86_FAMILY #endif // ARCH_CPU_X86_FAMILY
bool ExceptionSnapshotLinux::Initialize( bool ExceptionSnapshotLinux::Initialize(
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h --- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
=================================================================== +++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
@@ -91,6 +91,8 @@ class ExceptionSnapshotLinux final : pub @@ -91,6 +91,8 @@ class ExceptionSnapshotLinux final : pub
CPUContextMIPS64 mips64; CPUContextMIPS64 mips64;
#elif defined(ARCH_CPU_RISCV64) #elif defined(ARCH_CPU_RISCV64)
@ -679,10 +647,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/exce
#endif #endif
} context_union_; } context_union_;
CPUContext context_; CPUContext context_;
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc --- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
=================================================================== +++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
@@ -325,7 +325,28 @@ void ExpectContext(const CPUContext& act @@ -325,7 +325,28 @@ void ExpectContext(const CPUContext& act
sizeof(actual.riscv64->fpregs)), sizeof(actual.riscv64->fpregs)),
0); 0);
@ -712,10 +678,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/exce
#else #else
#error Port. #error Port.
#endif #endif
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc --- a/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
=================================================================== +++ b/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
@@ -129,6 +129,8 @@ void ProcessReaderLinux::Thread::Initial @@ -129,6 +129,8 @@ void ProcessReaderLinux::Thread::Initial
: thread_info.thread_context.t32.regs[29]; : thread_info.thread_context.t32.regs[29];
#elif defined(ARCH_CPU_RISCV64) #elif defined(ARCH_CPU_RISCV64)
@ -725,10 +689,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/proc
#else #else
#error Port. #error Port.
#endif #endif
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/signal_context.h --- a/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
=================================================================== +++ b/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
@@ -456,6 +456,89 @@ static_assert(offsetof(UContext<ContextT @@ -456,6 +456,89 @@ static_assert(offsetof(UContext<ContextT
offsetof(ucontext_t, uc_mcontext.__fpregs), offsetof(ucontext_t, uc_mcontext.__fpregs),
"context offset mismatch"); "context offset mismatch");
@ -819,10 +781,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/sign
#else #else
#error Port. #error Port.
#endif // ARCH_CPU_X86_FAMILY #endif // ARCH_CPU_X86_FAMILY
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc --- a/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
=================================================================== +++ b/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
@@ -208,6 +208,8 @@ CPUArchitecture SystemSnapshotLinux::Get @@ -208,6 +208,8 @@ CPUArchitecture SystemSnapshotLinux::Get
: kCPUArchitectureMIPSEL; : kCPUArchitectureMIPSEL;
#elif defined(ARCH_CPU_RISCV64) #elif defined(ARCH_CPU_RISCV64)
@ -852,7 +812,7 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/syst
#else #else
#error port to your architecture #error port to your architecture
#endif #endif
@@ -385,6 +393,9 @@ bool SystemSnapshotLinux::NXEnabled() co @@ -380,6 +388,9 @@ bool SystemSnapshotLinux::NXEnabled() co
#elif defined(ARCH_CPU_RISCV64) #elif defined(ARCH_CPU_RISCV64)
// Not implemented // Not implemented
return false; return false;
@ -862,10 +822,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/syst
#else #else
#error Port. #error Port.
#endif // ARCH_CPU_X86_FAMILY #endif // ARCH_CPU_X86_FAMILY
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc --- a/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
=================================================================== +++ b/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
@@ -196,6 +196,14 @@ bool ThreadSnapshotLinux::Initialize( @@ -196,6 +196,14 @@ bool ThreadSnapshotLinux::Initialize(
InitializeCPUContextRISCV64(thread.thread_info.thread_context.t64, InitializeCPUContextRISCV64(thread.thread_info.thread_context.t64,
thread.thread_info.float_context.f64, thread.thread_info.float_context.f64,
@ -881,10 +839,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/thre
#else #else
#error Port. #error Port.
#endif #endif
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h --- a/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
=================================================================== +++ b/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
@@ -76,6 +76,8 @@ class ThreadSnapshotLinux final : public @@ -76,6 +76,8 @@ class ThreadSnapshotLinux final : public
CPUContextMIPS64 mips64; CPUContextMIPS64 mips64;
#elif defined(ARCH_CPU_RISCV64) #elif defined(ARCH_CPU_RISCV64)
@ -894,10 +850,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/linux/thre
#else #else
#error Port. #error Port.
#endif // ARCH_CPU_X86_FAMILY #endif // ARCH_CPU_X86_FAMILY
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc --- a/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc
=================================================================== +++ b/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc
@@ -317,5 +317,38 @@ void InitializeCPUContextRISCV64(CPUCont @@ -317,5 +317,38 @@ void InitializeCPUContextRISCV64(CPUCont
riscv64->fcsr = value++; riscv64->fcsr = value++;
} }
@ -937,10 +891,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/test/test_
+ +
} // namespace test } // namespace test
} // namespace crashpad } // namespace crashpad
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h --- a/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h
=================================================================== +++ b/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h
@@ -64,6 +64,7 @@ void InitializeCPUContextARM64(CPUContex @@ -64,6 +64,7 @@ void InitializeCPUContextARM64(CPUContex
void InitializeCPUContextMIPS(CPUContext* context, uint32_t seed); void InitializeCPUContextMIPS(CPUContext* context, uint32_t seed);
void InitializeCPUContextMIPS64(CPUContext* context, uint32_t seed); void InitializeCPUContextMIPS64(CPUContext* context, uint32_t seed);
@ -949,10 +901,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/snapshot/test/test_
//! \} //! \}
} // namespace test } // namespace test
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/test/linux/get_tls.cc --- a/third_party/crashpad/crashpad/test/linux/get_tls.cc
=================================================================== +++ b/third_party/crashpad/crashpad/test/linux/get_tls.cc
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/test/linux/get_tls.cc
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/test/linux/get_tls.cc
@@ -51,6 +51,8 @@ LinuxVMAddress GetTLS() { @@ -51,6 +51,8 @@ LinuxVMAddress GetTLS() {
: "$3"); : "$3");
#elif defined(ARCH_CPU_RISCV64) #elif defined(ARCH_CPU_RISCV64)
@ -962,10 +912,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/test/linux/get_tls.
#else #else
#error Port. #error Port.
#endif // ARCH_CPU_ARMEL #endif // ARCH_CPU_ARMEL
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/test/multiprocess_posix.cc --- a/third_party/crashpad/crashpad/test/multiprocess_posix.cc
=================================================================== +++ b/third_party/crashpad/crashpad/test/multiprocess_posix.cc
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/test/multiprocess_posix.cc
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/test/multiprocess_posix.cc
@@ -162,7 +162,8 @@ void Multiprocess::SetExpectedChildTermi @@ -162,7 +162,8 @@ void Multiprocess::SetExpectedChildTermi
} }
@ -976,10 +924,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/test/multiprocess_p
SetExpectedChildTermination(kTerminationSignal, SIGTRAP); SetExpectedChildTermination(kTerminationSignal, SIGTRAP);
#else #else
SetExpectedChildTermination(kTerminationSignal, SIGILL); SetExpectedChildTermination(kTerminationSignal, SIGILL);
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc --- a/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
=================================================================== +++ b/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect @@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
if (type == AT_IGNORE) { if (type == AT_IGNORE) {
continue; continue;
@ -992,10 +938,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/util/linux/auxiliar
if (!MapInsertOrReplace(&values_, type, value, nullptr)) { if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
LOG(ERROR) << "duplicate auxv entry"; LOG(ERROR) << "duplicate auxv entry";
return false; return false;
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/util/linux/ptracer.cc --- a/third_party/crashpad/crashpad/util/linux/ptracer.cc
=================================================================== +++ b/third_party/crashpad/crashpad/util/linux/ptracer.cc
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/util/linux/ptracer.cc
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/util/linux/ptracer.cc
@@ -430,6 +430,64 @@ bool GetThreadArea64(pid_t tid, @@ -430,6 +430,64 @@ bool GetThreadArea64(pid_t tid,
return true; return true;
} }
@ -1071,10 +1015,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/util/linux/ptracer.
GetThreadArea64(tid, GetThreadArea64(tid,
info->thread_context, info->thread_context,
&info->thread_specific_data_address, &info->thread_specific_data_address,
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/util/linux/thread_info.h --- a/third_party/crashpad/crashpad/util/linux/thread_info.h
=================================================================== +++ b/third_party/crashpad/crashpad/util/linux/thread_info.h
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/util/linux/thread_info.h
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/util/linux/thread_info.h
@@ -34,6 +34,10 @@ @@ -34,6 +34,10 @@
#include <asm/ptrace.h> #include <asm/ptrace.h>
#endif #endif
@ -1193,10 +1135,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/util/linux/thread_i
//! \brief The thread-local storage address for the thread. //! \brief The thread-local storage address for the thread.
LinuxVMAddress thread_specific_data_address; LinuxVMAddress thread_specific_data_address;
}; };
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/util/misc/capture_context.h --- a/third_party/crashpad/crashpad/util/misc/capture_context.h
=================================================================== +++ b/third_party/crashpad/crashpad/util/misc/capture_context.h
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/util/misc/capture_context.h
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/util/misc/capture_context.h
@@ -70,6 +70,7 @@ using NativeCPUContext = ucontext_t; @@ -70,6 +70,7 @@ using NativeCPUContext = ucontext_t;
//! Linux | ARM/ARM64 | `r0`/`x0` //! Linux | ARM/ARM64 | `r0`/`x0`
//! Linux | MIPS/MIPS64 | `$a0` //! Linux | MIPS/MIPS64 | `$a0`
@ -1205,10 +1145,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/util/misc/capture_c
//! //!
//! Additionally, the value `LR` on ARM/ARM64 will be the return address of //! Additionally, the value `LR` on ARM/ARM64 will be the return address of
//! this function. //! this function.
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/util/misc/capture_context_linux.S --- a/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
=================================================================== +++ b/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
.globl CAPTURECONTEXT_SYMBOL2 .globl CAPTURECONTEXT_SYMBOL2
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
@ -1435,10 +1373,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/util/misc/capture_c
#elif defined(__riscv) #elif defined(__riscv)
#define MCONTEXT_GREGS_OFFSET 176 #define MCONTEXT_GREGS_OFFSET 176
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/util/misc/capture_context_test.cc --- a/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
=================================================================== +++ b/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
@@ -48,7 +48,7 @@ void TestCaptureContext() { @@ -48,7 +48,7 @@ void TestCaptureContext() {
uintptr_t pc = ProgramCounterFromContext(context_1); uintptr_t pc = ProgramCounterFromContext(context_1);
@ -1448,10 +1384,8 @@ Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/util/misc/capture_c
// Sanitizers can cause enough code bloat that the “nearby” check would // Sanitizers can cause enough code bloat that the “nearby” check would
// likely fail. // likely fail.
const uintptr_t kReferencePC = const uintptr_t kReferencePC =
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc --- a/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
=================================================================== +++ b/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
@@ -38,6 +38,8 @@ void SanityCheckContext(const NativeCPUC @@ -38,6 +38,8 @@ void SanityCheckContext(const NativeCPUC
#elif defined(ARCH_CPU_RISCV64) #elif defined(ARCH_CPU_RISCV64)
EXPECT_EQ(context.uc_mcontext.__gregs[10], EXPECT_EQ(context.uc_mcontext.__gregs[10],

@ -1,10 +1,8 @@
Index: chromium-128.0.6613.113/sandbox/linux/services/credentials.cc --- a/sandbox/linux/services/credentials.cc
=================================================================== +++ b/sandbox/linux/services/credentials.cc
--- chromium-128.0.6613.113.orig/sandbox/linux/services/credentials.cc @@ -91,7 +91,7 @@ bool ChrootToSafeEmptyDir() {
+++ chromium-128.0.6613.113/sandbox/linux/services/credentials.cc
@@ -85,7 +85,7 @@ bool ChrootToSafeEmptyDir() {
pid_t pid = -1;
alignas(16) char stack_buf[PTHREAD_STACK_MIN]; alignas(16) char stack_buf[PTHREAD_STACK_MIN];
#if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
- defined(ARCH_CPU_MIPS_FAMILY) - defined(ARCH_CPU_MIPS_FAMILY)
+ defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY) + defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)

@ -0,0 +1,12 @@
diff -up chromium-129.0.6668.42/build/rust/cargo_crate.gni.me chromium-129.0.6668.42/build/rust/cargo_crate.gni
--- chromium-129.0.6668.42/build/rust/cargo_crate.gni.me 2024-09-16 14:19:49.407900780 +0200
+++ chromium-129.0.6668.42/build/rust/cargo_crate.gni 2024-09-16 14:21:33.411392581 +0200
@@ -429,7 +429,7 @@ template("cargo_crate") {
rust_abi_target,
]
}
- if (current_cpu == "arm64" || current_cpu == "x64") {
+ if (current_cpu == "arm64" || current_cpu == "x64" || current_cpu == "ppc64") {
args += [
"--pointer-width",
"64",

@ -1,667 +0,0 @@
diff -up chromium-126.0.6478.26/base/allocator/partition_allocator/src/partition_alloc/starscan/stats_collector.h.system-libstdc++ chromium-126.0.6478.26/base/allocator/partition_allocator/src/partition_alloc/starscan/stats_collector.h
--- chromium-126.0.6478.26/base/allocator/partition_allocator/src/partition_alloc/starscan/stats_collector.h.system-libstdc++ 2024-05-29 18:00:45.000000000 +0200
+++ chromium-126.0.6478.26/base/allocator/partition_allocator/src/partition_alloc/starscan/stats_collector.h 2024-06-02 23:51:25.562917154 +0200
@@ -14,7 +14,7 @@
#include <unordered_map>
#include <utility>
-#include "partition_alloc/internal_allocator_forward.h"
+#include "partition_alloc/internal_allocator.h"
#include "partition_alloc/partition_alloc_base/threading/platform_thread.h"
#include "partition_alloc/partition_alloc_base/time/time.h"
#include "partition_alloc/partition_alloc_check.h"
diff -up chromium-126.0.6478.26/chrome/browser/ui/tabs/tab_strip_model.h.system-libstdc++ chromium-126.0.6478.26/chrome/browser/ui/tabs/tab_strip_model.h
--- chromium-126.0.6478.26/chrome/browser/ui/tabs/tab_strip_model.h.system-libstdc++ 2024-05-29 18:00:59.000000000 +0200
+++ chromium-126.0.6478.26/chrome/browser/ui/tabs/tab_strip_model.h 2024-06-02 23:51:25.563917178 +0200
@@ -12,6 +12,7 @@
#include <memory>
#include <optional>
#include <string>
+#include <variant>
#include <vector>
#include "base/containers/span.h"
diff -up chromium-126.0.6478.26/components/viz/service/display/surface_aggregator.cc.system-libstdc++ chromium-126.0.6478.26/components/viz/service/display/surface_aggregator.cc
--- chromium-126.0.6478.26/components/viz/service/display/surface_aggregator.cc.system-libstdc++ 2024-05-29 18:01:12.000000000 +0200
+++ chromium-126.0.6478.26/components/viz/service/display/surface_aggregator.cc 2024-06-02 23:51:25.563917178 +0200
@@ -2296,7 +2296,7 @@ AggregatedFrame SurfaceAggregator::Aggre
root_surface_id_ = surface_id;
// Start recording new stats for this aggregation.
- stats_.emplace();
+ stats_ = AggregateStatistics{};
base::ElapsedTimer prewalk_timer;
ResolvedFrameData* resolved_frame = GetResolvedFrame(surface_id);
diff -up chromium-126.0.6478.26/content/browser/first_party_sets/first_party_sets_handler_database_helper.cc.system-libstdc++ chromium-126.0.6478.26/content/browser/first_party_sets/first_party_sets_handler_database_helper.cc
--- chromium-126.0.6478.26/content/browser/first_party_sets/first_party_sets_handler_database_helper.cc.system-libstdc++ 2024-05-29 18:01:12.000000000 +0200
+++ chromium-126.0.6478.26/content/browser/first_party_sets/first_party_sets_handler_database_helper.cc 2024-06-02 23:51:25.563917178 +0200
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <optional>
#include "content/browser/first_party_sets/first_party_sets_handler_database_helper.h"
#include "base/containers/contains.h"
diff -up chromium-126.0.6478.26/content/services/auction_worklet/real_time_reporting_bindings.h.system-libstdc++ chromium-126.0.6478.26/content/services/auction_worklet/real_time_reporting_bindings.h
--- chromium-126.0.6478.26/content/services/auction_worklet/real_time_reporting_bindings.h.system-libstdc++ 2024-06-04 13:52:43.689553459 +0200
+++ chromium-126.0.6478.26/content/services/auction_worklet/real_time_reporting_bindings.h 2024-06-04 13:52:01.117778943 +0200
@@ -12,7 +12,7 @@
#include "content/common/content_export.h"
#include "content/services/auction_worklet/auction_v8_helper.h"
#include "content/services/auction_worklet/context_recycler.h"
-#include "content/services/auction_worklet/public/mojom/real_time_reporting.mojom-forward.h"
+#include "content/services/auction_worklet/public/mojom/real_time_reporting.mojom.h"
#include "v8/include/v8-forward.h"
namespace auction_worklet {
diff -up chromium-126.0.6478.26/gpu/command_buffer/service/shared_image/shared_image_backing.h.system-libstdc++ chromium-126.0.6478.26/gpu/command_buffer/service/shared_image/shared_image_backing.h
--- chromium-126.0.6478.26/gpu/command_buffer/service/shared_image/shared_image_backing.h.system-libstdc++ 2024-05-29 18:01:26.000000000 +0200
+++ chromium-126.0.6478.26/gpu/command_buffer/service/shared_image/shared_image_backing.h 2024-06-02 23:51:25.564917202 +0200
@@ -111,6 +111,25 @@ using VideoDecodeDevice = Microsoft::WRL
using VideoDecodeDevice = void*;
#endif // BUILDFLAG(IS_WIN)
+class ScopedWriteUMA {
+ public:
+ ScopedWriteUMA() = default;
+
+ ScopedWriteUMA(const ScopedWriteUMA&) = delete;
+ ScopedWriteUMA& operator=(const ScopedWriteUMA&) = delete;
+
+ ~ScopedWriteUMA() {
+ UMA_HISTOGRAM_BOOLEAN("GPU.SharedImage.ContentConsumed",
+ content_consumed_);
+ }
+
+ bool content_consumed() const { return content_consumed_; }
+ void SetConsumed() { content_consumed_ = true; }
+
+ private:
+ bool content_consumed_ = false;
+};
+
// Represents the actual storage (GL texture, VkImage, GMB) for a SharedImage.
// Should not be accessed directly, instead is accessed through a
// SharedImageRepresentation.
@@ -384,25 +403,6 @@ class GPU_GLES2_EXPORT SharedImageBackin
mutable std::optional<base::Lock> lock_;
private:
- class ScopedWriteUMA {
- public:
- ScopedWriteUMA() = default;
-
- ScopedWriteUMA(const ScopedWriteUMA&) = delete;
- ScopedWriteUMA& operator=(const ScopedWriteUMA&) = delete;
-
- ~ScopedWriteUMA() {
- UMA_HISTOGRAM_BOOLEAN("GPU.SharedImage.ContentConsumed",
- content_consumed_);
- }
-
- bool content_consumed() const { return content_consumed_; }
- void SetConsumed() { content_consumed_ = true; }
-
- private:
- bool content_consumed_ = false;
- };
-
const Mailbox mailbox_;
const viz::SharedImageFormat format_;
const gfx::Size size_;
diff -up chromium-126.0.6478.26/mojo/public/cpp/bindings/lib/multiplex_router.cc.system-libstdc++ chromium-126.0.6478.26/mojo/public/cpp/bindings/lib/multiplex_router.cc
--- chromium-126.0.6478.26/mojo/public/cpp/bindings/lib/multiplex_router.cc.system-libstdc++ 2024-05-29 18:01:33.000000000 +0200
+++ chromium-126.0.6478.26/mojo/public/cpp/bindings/lib/multiplex_router.cc 2024-06-02 23:51:25.564917202 +0200
@@ -893,7 +893,7 @@ bool MultiplexRouter::ExclusiveSyncWaitF
DCHECK(!exclusive_sync_wait_);
scoped_refptr<MultiplexRouter> keep_alive(this);
- exclusive_sync_wait_.emplace();
+ exclusive_sync_wait_ = ExclusiveSyncWaitInfo{};
exclusive_sync_wait_->interface_id = interface_id;
exclusive_sync_wait_->request_id = request_id;
while (!exclusive_sync_wait_->finished) {
diff -up chromium-126.0.6478.26/third_party/blink/common/interest_group/auction_config_mojom_traits.cc.system-libstdc++ chromium-126.0.6478.26/third_party/blink/common/interest_group/auction_config_mojom_traits.cc
--- chromium-126.0.6478.26/third_party/blink/common/interest_group/auction_config_mojom_traits.cc.system-libstdc++ 2024-05-29 18:01:37.000000000 +0200
+++ chromium-126.0.6478.26/third_party/blink/common/interest_group/auction_config_mojom_traits.cc 2024-06-02 23:51:25.565917225 +0200
@@ -225,8 +225,6 @@ bool StructTraits<blink::mojom::AuctionA
!data.ReadAllBuyersPrioritySignals(&out->all_buyers_priority_signals) ||
!data.ReadAuctionReportBuyerKeys(&out->auction_report_buyer_keys) ||
!data.ReadAuctionReportBuyers(&out->auction_report_buyers) ||
- !data.ReadAuctionReportBuyerDebugModeConfig(
- &out->auction_report_buyer_debug_mode_config) ||
!data.ReadRequiredSellerCapabilities(
&out->required_seller_capabilities) ||
!data.ReadRequestedSize(&out->requested_size) ||
diff -up chromium-126.0.6478.26/third_party/blink/renderer/core/loader/history_item.cc.system-libstdc++ chromium-126.0.6478.26/third_party/blink/renderer/core/loader/history_item.cc
--- chromium-126.0.6478.26/third_party/blink/renderer/core/loader/history_item.cc.system-libstdc++ 2024-05-29 18:01:39.000000000 +0200
+++ chromium-126.0.6478.26/third_party/blink/renderer/core/loader/history_item.cc 2024-06-02 23:51:25.565917225 +0200
@@ -182,26 +182,26 @@ void HistoryItem::SetReferrerPolicy(netw
void HistoryItem::SetVisualViewportScrollOffset(const ScrollOffset& offset) {
if (!view_state_)
- view_state_ = std::make_optional<ViewState>();
+ view_state_ = blink::HistoryItem::ViewState{};
view_state_->visual_viewport_scroll_offset_ = offset;
}
void HistoryItem::SetScrollOffset(const ScrollOffset& offset) {
if (!view_state_)
- view_state_ = std::make_optional<ViewState>();
+ view_state_ = blink::HistoryItem::ViewState{};
view_state_->scroll_offset_ = offset;
}
void HistoryItem::SetPageScaleFactor(float scale_factor) {
if (!view_state_)
- view_state_ = std::make_optional<ViewState>();
+ view_state_ = blink::HistoryItem::ViewState{};
view_state_->page_scale_factor_ = scale_factor;
}
void HistoryItem::SetScrollAnchorData(
const ScrollAnchorData& scroll_anchor_data) {
if (!view_state_)
- view_state_ = std::make_optional<ViewState>();
+ view_state_ = blink::HistoryItem::ViewState{};
view_state_->scroll_anchor_data_ = scroll_anchor_data;
}
diff -up chromium-126.0.6478.26/third_party/blink/renderer/core/page/page_popup_controller.h.system-libstdc++ chromium-126.0.6478.26/third_party/blink/renderer/core/page/page_popup_controller.h
--- chromium-126.0.6478.26/third_party/blink/renderer/core/page/page_popup_controller.h.system-libstdc++ 2024-06-04 17:01:05.066469613 +0200
+++ chromium-126.0.6478.26/third_party/blink/renderer/core/page/page_popup_controller.h 2024-06-04 16:51:41.076869743 +0200
@@ -31,6 +31,7 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_PAGE_PAGE_POPUP_CONTROLLER_H_
#define THIRD_PARTY_BLINK_RENDERER_CORE_PAGE_PAGE_POPUP_CONTROLLER_H_
+#include <optional>
#include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
#include "third_party/blink/renderer/platform/heap/collection_support/heap_vector.h"
#include "third_party/blink/renderer/platform/heap/garbage_collected.h"
diff -up chromium-126.0.6478.26/third_party/blink/renderer/core/paint/fragment_data_iterator.h.system-libstdc++ chromium-126.0.6478.26/third_party/blink/renderer/core/paint/fragment_data_iterator.h
--- chromium-126.0.6478.26/third_party/blink/renderer/core/paint/fragment_data_iterator.h.system-libstdc++ 2024-05-29 18:01:40.000000000 +0200
+++ chromium-126.0.6478.26/third_party/blink/renderer/core/paint/fragment_data_iterator.h 2024-06-02 23:51:25.565917225 +0200
@@ -22,7 +22,7 @@ class FragmentDataIteratorBase {
public:
explicit FragmentDataIteratorBase(Head& head) : fragment_head_(head) {}
- explicit FragmentDataIteratorBase(nullptr_t) {}
+ explicit FragmentDataIteratorBase(std::nullptr_t) {}
Data* GetFragmentData() const {
return !IsDone() ? &fragment_head_.at(idx_) : nullptr;
diff -up chromium-126.0.6478.26/third_party/blink/renderer/modules/encoding/text_decoder.h.system-libstdc++ chromium-126.0.6478.26/third_party/blink/renderer/modules/encoding/text_decoder.h
--- chromium-126.0.6478.26/third_party/blink/renderer/modules/encoding/text_decoder.h.system-libstdc++ 2024-06-03 23:14:03.138724802 +0200
+++ chromium-126.0.6478.26/third_party/blink/renderer/modules/encoding/text_decoder.h 2024-06-03 23:14:41.395654435 +0200
@@ -31,6 +31,7 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_ENCODING_TEXT_DECODER_H_
#define THIRD_PARTY_BLINK_RENDERER_MODULES_ENCODING_TEXT_DECODER_H_
+#include <optional>
#include <memory>
#include "third_party/blink/renderer/bindings/core/v8/v8_typedefs.h"
diff -up chromium-126.0.6478.26/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc.system-libstdc++ chromium-126.0.6478.26/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc
--- chromium-126.0.6478.26/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc.system-libstdc++ 2024-05-29 18:01:40.000000000 +0200
+++ chromium-126.0.6478.26/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc 2024-06-02 23:51:25.566917250 +0200
@@ -102,7 +102,7 @@ void MediaControlTimelineElement::Update
void MediaControlTimelineElement::SetPosition(double current_time,
bool suppress_aria) {
if (is_live_ && !live_anchor_time_ && current_time != 0) {
- live_anchor_time_.emplace();
+ live_anchor_time_ = LiveAnchorTime{};
live_anchor_time_->clock_time_ = base::TimeTicks::Now();
live_anchor_time_->media_time_ = MediaElement().currentTime();
}
diff -up chromium-126.0.6478.26/third_party/blink/renderer/platform/fonts/shaping/run_segmenter.h.system-libstdc++ chromium-126.0.6478.26/third_party/blink/renderer/platform/fonts/shaping/run_segmenter.h
--- chromium-126.0.6478.26/third_party/blink/renderer/platform/fonts/shaping/run_segmenter.h.system-libstdc++ 2024-06-04 16:52:15.268516255 +0200
+++ chromium-126.0.6478.26/third_party/blink/renderer/platform/fonts/shaping/run_segmenter.h 2024-06-04 16:56:23.906705337 +0200
@@ -7,6 +7,7 @@
#include <unicode/uscript.h>
#include <memory>
+#include <optional>
#include "third_party/blink/renderer/platform/fonts/font_orientation.h"
#include "third_party/blink/renderer/platform/fonts/orientation_iterator.h"
#include "third_party/blink/renderer/platform/fonts/script_run_iterator.h"
diff -up chromium-126.0.6478.26/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc.system-libstdc++ chromium-126.0.6478.26/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc
--- chromium-126.0.6478.26/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc.system-libstdc++ 2024-05-29 18:01:41.000000000 +0200
+++ chromium-126.0.6478.26/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc 2024-06-02 23:51:25.566917250 +0200
@@ -70,7 +70,7 @@ void GeometryMapperTransformCache::Updat
to_2d_translation_root_ += translation;
if (parent.plane_root_transform_) {
- plane_root_transform_.emplace();
+ plane_root_transform_ = PlaneRootTransform{};
plane_root_transform_->plane_root = parent.plane_root();
plane_root_transform_->to_plane_root = parent.to_plane_root();
plane_root_transform_->to_plane_root.Translate(translation.x(),
@@ -98,7 +98,7 @@ void GeometryMapperTransformCache::Updat
// as the 2d translation root.
plane_root_transform_ = std::nullopt;
} else {
- plane_root_transform_.emplace();
+ plane_root_transform_ = PlaneRootTransform{};
plane_root_transform_->plane_root = parent.plane_root();
plane_root_transform_->to_plane_root.MakeIdentity();
parent.ApplyToPlaneRoot(plane_root_transform_->to_plane_root);
@@ -140,7 +140,7 @@ void GeometryMapperTransformCache::Updat
parent_node->UpdateScreenTransform();
const auto& parent = parent_node->GetTransformCache();
- screen_transform_.emplace();
+ screen_transform_ = ScreenTransform{};
parent.ApplyToScreen(screen_transform_->to_screen);
if (node.FlattensInheritedTransform())
screen_transform_->to_screen.Flatten();
diff -up chromium-126.0.6478.26/third_party/ruy/src/ruy/profiler/instrumentation.h.system-libstdc++ chromium-126.0.6478.26/third_party/ruy/src/ruy/profiler/instrumentation.h
--- chromium-126.0.6478.26/third_party/ruy/src/ruy/profiler/instrumentation.h.system-libstdc++ 2024-05-29 18:03:01.000000000 +0200
+++ chromium-126.0.6478.26/third_party/ruy/src/ruy/profiler/instrumentation.h 2024-06-02 23:51:25.566917250 +0200
@@ -19,6 +19,7 @@ limitations under the License.
#ifdef RUY_PROFILER
#include <cstdio>
#include <mutex>
+#include <string>
#include <vector>
#endif
diff -up chromium-126.0.6478.26/third_party/webrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc.system-libstdc++ chromium-126.0.6478.26/third_party/webrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc
--- chromium-126.0.6478.26/third_party/webrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc.system-libstdc++ 2024-05-29 18:03:48.000000000 +0200
+++ chromium-126.0.6478.26/third_party/webrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc 2024-06-02 23:51:25.567917273 +0200
@@ -549,7 +549,7 @@ absl::optional<LossBasedBweV2::Config> L
if (!enabled.Get()) {
return config;
}
- config.emplace();
+ config = Config{};
config->bandwidth_rampup_upper_bound_factor =
bandwidth_rampup_upper_bound_factor.Get();
config->bandwidth_rampup_upper_bound_factor_in_hold =
diff -up chromium-126.0.6478.26/ui/gfx/x/generated_protos/randr.cc.system-libstdc++ chromium-126.0.6478.26/ui/gfx/x/generated_protos/randr.cc
--- chromium-126.0.6478.26/ui/gfx/x/generated_protos/randr.cc.system-libstdc++ 2024-05-29 18:02:32.000000000 +0200
+++ chromium-126.0.6478.26/ui/gfx/x/generated_protos/randr.cc 2024-06-02 23:51:25.568917297 +0200
@@ -305,7 +305,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
// data
auto data_expr = subCode;
if (CaseEq(data_expr, RandR::Notify::CrtcChange)) {
- data.cc.emplace();
+ data.cc = RandR::NotifyEvent::Cc{};
auto& timestamp = (*data.cc).timestamp;
auto& window = (*data.cc).window;
auto& crtc = (*data.cc).crtc;
@@ -349,7 +349,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
Read(&height, &buf);
}
if (CaseEq(data_expr, RandR::Notify::OutputChange)) {
- data.oc.emplace();
+ data.oc = RandR::NotifyEvent::Oc{};
auto& timestamp = (*data.oc).timestamp;
auto& config_timestamp = (*data.oc).config_timestamp;
auto& window = (*data.oc).window;
@@ -394,7 +394,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
subpixel_order = static_cast<Render::SubPixel>(tmp6);
}
if (CaseEq(data_expr, RandR::Notify::OutputProperty)) {
- data.op.emplace();
+ data.op = RandR::NotifyEvent::Op{};
auto& window = (*data.op).window;
auto& output = (*data.op).output;
auto& atom = (*data.op).atom;
@@ -422,7 +422,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
Pad(&buf, 11);
}
if (CaseEq(data_expr, RandR::Notify::ProviderChange)) {
- data.pc.emplace();
+ data.pc = RandR::NotifyEvent::Pc{};
auto& timestamp = (*data.pc).timestamp;
auto& window = (*data.pc).window;
auto& provider = (*data.pc).provider;
@@ -440,7 +440,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
Pad(&buf, 16);
}
if (CaseEq(data_expr, RandR::Notify::ProviderProperty)) {
- data.pp.emplace();
+ data.pp = RandR::NotifyEvent::Pp{};
auto& window = (*data.pp).window;
auto& provider = (*data.pp).provider;
auto& atom = (*data.pp).atom;
@@ -466,7 +466,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
Pad(&buf, 11);
}
if (CaseEq(data_expr, RandR::Notify::ResourceChange)) {
- data.rc.emplace();
+ data.rc = RandR::NotifyEvent::Rc{};
auto& timestamp = (*data.rc).timestamp;
auto& window = (*data.rc).window;
@@ -480,7 +480,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
Pad(&buf, 20);
}
if (CaseEq(data_expr, RandR::Notify::Lease)) {
- data.lc.emplace();
+ data.lc = RandR::NotifyEvent::Lc{};
auto& timestamp = (*data.lc).timestamp;
auto& window = (*data.lc).window;
auto& lease = (*data.lc).lease;
diff -up chromium-126.0.6478.26/ui/gfx/x/generated_protos/xinput.cc.system-libstdc++ chromium-126.0.6478.26/ui/gfx/x/generated_protos/xinput.cc
--- chromium-126.0.6478.26/ui/gfx/x/generated_protos/xinput.cc.system-libstdc++ 2024-05-29 18:02:32.000000000 +0200
+++ chromium-126.0.6478.26/ui/gfx/x/generated_protos/xinput.cc 2024-06-02 23:51:25.569917321 +0200
@@ -560,7 +560,7 @@ void ReadEvent<Input::DeviceChangedEvent
// data
auto data_expr = type;
if (CaseEq(data_expr, Input::DeviceClassType::Key)) {
- data.key.emplace();
+ data.key = Input::DeviceClass::Key{};
uint16_t num_keys{};
auto& keys = (*data.key).keys;
@@ -575,7 +575,7 @@ void ReadEvent<Input::DeviceChangedEvent
}
}
if (CaseEq(data_expr, Input::DeviceClassType::Button)) {
- data.button.emplace();
+ data.button = Input::DeviceClass::Button{};
uint16_t num_buttons{};
auto& state = (*data.button).state;
auto& labels = (*data.button).labels;
@@ -598,7 +598,7 @@ void ReadEvent<Input::DeviceChangedEvent
}
}
if (CaseEq(data_expr, Input::DeviceClassType::Valuator)) {
- data.valuator.emplace();
+ data.valuator = Input::DeviceClass::Valuator{};
auto& number = (*data.valuator).number;
auto& label = (*data.valuator).label;
auto& min = (*data.valuator).min;
@@ -661,7 +661,7 @@ void ReadEvent<Input::DeviceChangedEvent
Pad(&buf, 3);
}
if (CaseEq(data_expr, Input::DeviceClassType::Scroll)) {
- data.scroll.emplace();
+ data.scroll = Input::DeviceClass::Scroll{};
auto& number = (*data.scroll).number;
auto& scroll_type = (*data.scroll).scroll_type;
auto& flags = (*data.scroll).flags;
@@ -696,7 +696,7 @@ void ReadEvent<Input::DeviceChangedEvent
}
}
if (CaseEq(data_expr, Input::DeviceClassType::Touch)) {
- data.touch.emplace();
+ data.touch = Input::DeviceClass::Touch{};
auto& mode = (*data.touch).mode;
auto& num_touches = (*data.touch).num_touches;
@@ -709,7 +709,7 @@ void ReadEvent<Input::DeviceChangedEvent
Read(&num_touches, &buf);
}
if (CaseEq(data_expr, Input::DeviceClassType::Gesture)) {
- data.gesture.emplace();
+ data.gesture = Input::DeviceClass::Gesture{};
auto& num_touches = (*data.gesture).num_touches;
// num_touches
@@ -2187,7 +2187,7 @@ std::unique_ptr<Input::ListInputDevicesR
// info
auto info_expr = class_id;
if (CaseEq(info_expr, Input::InputClass::Key)) {
- info.key.emplace();
+ info.key = Input::InputInfo::Key{};
auto& min_keycode = (*info.key).min_keycode;
auto& max_keycode = (*info.key).max_keycode;
auto& num_keys = (*info.key).num_keys;
@@ -2205,14 +2205,14 @@ std::unique_ptr<Input::ListInputDevicesR
Pad(&buf, 2);
}
if (CaseEq(info_expr, Input::InputClass::Button)) {
- info.button.emplace();
+ info.button = Input::InputInfo::Button{};
auto& num_buttons = (*info.button).num_buttons;
// num_buttons
Read(&num_buttons, &buf);
}
if (CaseEq(info_expr, Input::InputClass::Valuator)) {
- info.valuator.emplace();
+ info.valuator = Input::InputInfo::Valuator{};
uint8_t axes_len{};
auto& mode = (*info.valuator).mode;
auto& motion_size = (*info.valuator).motion_size;
@@ -3818,7 +3818,7 @@ std::unique_ptr<Input::GetFeedbackContro
// data
auto data_expr = class_id;
if (CaseEq(data_expr, Input::FeedbackClass::Keyboard)) {
- data.keyboard.emplace();
+ data.keyboard = x11::Input::FeedbackState::Keyboard{};
auto& pitch = (*data.keyboard).pitch;
auto& duration = (*data.keyboard).duration;
auto& led_mask = (*data.keyboard).led_mask;
@@ -3859,7 +3859,7 @@ std::unique_ptr<Input::GetFeedbackContro
}
}
if (CaseEq(data_expr, Input::FeedbackClass::Pointer)) {
- data.pointer.emplace();
+ data.pointer = x11::Input::FeedbackState::Pointer{};
auto& accel_num = (*data.pointer).accel_num;
auto& accel_denom = (*data.pointer).accel_denom;
auto& threshold = (*data.pointer).threshold;
@@ -3877,7 +3877,7 @@ std::unique_ptr<Input::GetFeedbackContro
Read(&threshold, &buf);
}
if (CaseEq(data_expr, Input::FeedbackClass::String)) {
- data.string.emplace();
+ data.string = x11::Input::FeedbackState::String{};
auto& max_symbols = (*data.string).max_symbols;
uint16_t num_keysyms{};
auto& keysyms = (*data.string).keysyms;
@@ -3896,7 +3896,7 @@ std::unique_ptr<Input::GetFeedbackContro
}
}
if (CaseEq(data_expr, Input::FeedbackClass::Integer)) {
- data.integer.emplace();
+ data.integer = x11::Input::FeedbackState::Integer{};
auto& resolution = (*data.integer).resolution;
auto& min_value = (*data.integer).min_value;
auto& max_value = (*data.integer).max_value;
@@ -3911,7 +3911,7 @@ std::unique_ptr<Input::GetFeedbackContro
Read(&max_value, &buf);
}
if (CaseEq(data_expr, Input::FeedbackClass::Led)) {
- data.led.emplace();
+ data.led = x11::Input::FeedbackState::Led{};
auto& led_mask = (*data.led).led_mask;
auto& led_values = (*data.led).led_values;
@@ -3922,7 +3922,7 @@ std::unique_ptr<Input::GetFeedbackContro
Read(&led_values, &buf);
}
if (CaseEq(data_expr, Input::FeedbackClass::Bell)) {
- data.bell.emplace();
+ data.bell = x11::Input::FeedbackState::Bell{};
auto& percent = (*data.bell).percent;
auto& pitch = (*data.bell).pitch;
auto& duration = (*data.bell).duration;
@@ -4735,7 +4735,7 @@ std::unique_ptr<Input::QueryDeviceStateR
// data
auto data_expr = class_id;
if (CaseEq(data_expr, Input::InputClass::Key)) {
- data.key.emplace();
+ data.key = x11::Input::InputState::Key{};
auto& num_keys = (*data.key).num_keys;
auto& keys = (*data.key).keys;
@@ -4752,7 +4752,7 @@ std::unique_ptr<Input::QueryDeviceStateR
}
}
if (CaseEq(data_expr, Input::InputClass::Button)) {
- data.button.emplace();
+ data.button = x11::Input::InputState::Button{};
auto& num_buttons = (*data.button).num_buttons;
auto& buttons = (*data.button).buttons;
@@ -4769,7 +4769,7 @@ std::unique_ptr<Input::QueryDeviceStateR
}
}
if (CaseEq(data_expr, Input::InputClass::Valuator)) {
- data.valuator.emplace();
+ data.valuator = x11::Input::InputState::Valuator{};
uint8_t num_valuators{};
auto& mode = (*data.valuator).mode;
auto& valuators = (*data.valuator).valuators;
@@ -5039,7 +5039,7 @@ std::unique_ptr<Input::GetDeviceControlR
// data
auto data_expr = control_id;
if (CaseEq(data_expr, Input::DeviceControl::resolution)) {
- data.resolution.emplace();
+ data.resolution = x11::Input::DeviceState::Resolution{};
uint32_t num_valuators{};
auto& resolution_values = (*data.resolution).resolution_values;
auto& resolution_min = (*data.resolution).resolution_min;
@@ -5070,7 +5070,7 @@ std::unique_ptr<Input::GetDeviceControlR
}
}
if (CaseEq(data_expr, Input::DeviceControl::abs_calib)) {
- data.abs_calib.emplace();
+ data.abs_calib = x11::Input::DeviceState::AbsCalib{};
auto& min_x = (*data.abs_calib).min_x;
auto& max_x = (*data.abs_calib).max_x;
auto& min_y = (*data.abs_calib).min_y;
@@ -5105,7 +5105,7 @@ std::unique_ptr<Input::GetDeviceControlR
Read(&button_threshold, &buf);
}
if (CaseEq(data_expr, Input::DeviceControl::core)) {
- data.core.emplace();
+ data.core = x11::Input::DeviceState::Core{};
auto& status = (*data.core).status;
auto& iscore = (*data.core).iscore;
@@ -5119,7 +5119,7 @@ std::unique_ptr<Input::GetDeviceControlR
Pad(&buf, 2);
}
if (CaseEq(data_expr, Input::DeviceControl::enable)) {
- data.enable.emplace();
+ data.enable = x11::Input::DeviceState::Enable{};
auto& enable = (*data.enable).enable;
// enable
@@ -5129,7 +5129,7 @@ std::unique_ptr<Input::GetDeviceControlR
Pad(&buf, 3);
}
if (CaseEq(data_expr, Input::DeviceControl::abs_area)) {
- data.abs_area.emplace();
+ data.abs_area = x11::Input::DeviceState::AbsArea{};
auto& offset_x = (*data.abs_area).offset_x;
auto& offset_y = (*data.abs_area).offset_y;
auto& width = (*data.abs_area).width;
@@ -6610,7 +6610,7 @@ std::unique_ptr<Input::XIQueryDeviceRepl
// data
auto data_expr = type;
if (CaseEq(data_expr, Input::DeviceClassType::Key)) {
- data.key.emplace();
+ data.key = Input::DeviceClass::Key{};
uint16_t num_keys{};
auto& keys = (*data.key).keys;
@@ -6625,7 +6625,7 @@ std::unique_ptr<Input::XIQueryDeviceRepl
}
}
if (CaseEq(data_expr, Input::DeviceClassType::Button)) {
- data.button.emplace();
+ data.button = Input::DeviceClass::Button{};
uint16_t num_buttons{};
auto& state = (*data.button).state;
auto& labels = (*data.button).labels;
@@ -6648,7 +6648,7 @@ std::unique_ptr<Input::XIQueryDeviceRepl
}
}
if (CaseEq(data_expr, Input::DeviceClassType::Valuator)) {
- data.valuator.emplace();
+ data.valuator = Input::DeviceClass::Valuator{};
auto& number = (*data.valuator).number;
auto& label = (*data.valuator).label;
auto& min = (*data.valuator).min;
@@ -6711,7 +6711,7 @@ std::unique_ptr<Input::XIQueryDeviceRepl
Pad(&buf, 3);
}
if (CaseEq(data_expr, Input::DeviceClassType::Scroll)) {
- data.scroll.emplace();
+ data.scroll = Input::DeviceClass::Scroll{};
auto& number = (*data.scroll).number;
auto& scroll_type = (*data.scroll).scroll_type;
auto& flags = (*data.scroll).flags;
@@ -6746,7 +6746,7 @@ std::unique_ptr<Input::XIQueryDeviceRepl
}
}
if (CaseEq(data_expr, Input::DeviceClassType::Touch)) {
- data.touch.emplace();
+ data.touch = Input::DeviceClass::Touch{};
auto& mode = (*data.touch).mode;
auto& num_touches = (*data.touch).num_touches;
@@ -6759,7 +6759,7 @@ std::unique_ptr<Input::XIQueryDeviceRepl
Read(&num_touches, &buf);
}
if (CaseEq(data_expr, Input::DeviceClassType::Gesture)) {
- data.gesture.emplace();
+ data.gesture = Input::DeviceClass::Gesture{};
auto& num_touches = (*data.gesture).num_touches;
// num_touches
diff -up chromium-126.0.6478.26/ui/gfx/x/generated_protos/xkb.cc.system-libstdc++ chromium-126.0.6478.26/ui/gfx/x/generated_protos/xkb.cc
--- chromium-126.0.6478.26/ui/gfx/x/generated_protos/xkb.cc.system-libstdc++ 2024-05-29 18:02:32.000000000 +0200
+++ chromium-126.0.6478.26/ui/gfx/x/generated_protos/xkb.cc 2024-06-02 23:51:25.570917345 +0200
@@ -2344,7 +2344,7 @@ std::unique_ptr<Xkb::GetMapReply> detail
// map
auto map_expr = present;
if (CaseAnd(map_expr, Xkb::MapPart::KeyTypes)) {
- map.types_rtrn.emplace();
+ map.types_rtrn = std::vector<Xkb::KeyType>{};
auto& types_rtrn = *map.types_rtrn;
// types_rtrn
@@ -5207,7 +5207,7 @@ std::unique_ptr<Xkb::GetKbdByNameReply>
if (CaseAnd(replies_expr, Xkb::GBNDetail::Types) ||
CaseAnd(replies_expr, Xkb::GBNDetail::ClientSymbols) ||
CaseAnd(replies_expr, Xkb::GBNDetail::ServerSymbols)) {
- replies.types.emplace();
+ replies.types = Xkb::GetKbdByNameReply::Types{};
auto& getmap_type = (*replies.types).getmap_type;
auto& typeDeviceID = (*replies.types).typeDeviceID;
auto& getmap_sequence = (*replies.types).getmap_sequence;
@@ -5626,7 +5626,7 @@ std::unique_ptr<Xkb::GetKbdByNameReply>
}
}
if (CaseAnd(replies_expr, Xkb::GBNDetail::CompatMap)) {
- replies.compat_map.emplace();
+ replies.compat_map = Xkb::GetKbdByNameReply::CompatMap{};
auto& compatmap_type = (*replies.compat_map).compatmap_type;
auto& compatDeviceID = (*replies.compat_map).compatDeviceID;
auto& compatmap_sequence = (*replies.compat_map).compatmap_sequence;
@@ -5747,7 +5747,7 @@ std::unique_ptr<Xkb::GetKbdByNameReply>
}
}
if (CaseAnd(replies_expr, Xkb::GBNDetail::IndicatorMaps)) {
- replies.indicator_maps.emplace();
+ replies.indicator_maps = Xkb::GetKbdByNameReply::IndicatorMaps{};
auto& indicatormap_type = (*replies.indicator_maps).indicatormap_type;
auto& indicatorDeviceID = (*replies.indicator_maps).indicatorDeviceID;
auto& indicatormap_sequence =
@@ -5840,7 +5840,7 @@ std::unique_ptr<Xkb::GetKbdByNameReply>
}
if (CaseAnd(replies_expr, Xkb::GBNDetail::KeyNames) ||
CaseAnd(replies_expr, Xkb::GBNDetail::OtherNames)) {
- replies.key_names.emplace();
+ replies.key_names = Xkb::GetKbdByNameReply::KeyNames{};
auto& keyname_type = (*replies.key_names).keyname_type;
auto& keyDeviceID = (*replies.key_names).keyDeviceID;
auto& keyname_sequence = (*replies.key_names).keyname_sequence;
@@ -6087,7 +6087,7 @@ std::unique_ptr<Xkb::GetKbdByNameReply>
}
}
if (CaseAnd(replies_expr, Xkb::GBNDetail::Geometry)) {
- replies.geometry.emplace();
+ replies.geometry = Xkb::GetKbdByNameReply::Geometry{};
auto& geometry_type = (*replies.geometry).geometry_type;
auto& geometryDeviceID = (*replies.geometry).geometryDeviceID;
auto& geometry_sequence = (*replies.geometry).geometry_sequence;

@ -0,0 +1,13 @@
diff -up chromium-128.0.6613.137/third_party/inspector_protocol/code_generator.py.me chromium-128.0.6613.137/third_party/inspector_protocol/code_generator.py
--- chromium-128.0.6613.137/third_party/inspector_protocol/code_generator.py.me 2024-09-16 12:47:47.541825252 +0200
+++ chromium-128.0.6613.137/third_party/inspector_protocol/code_generator.py 2024-09-16 12:48:39.210990291 +0200
@@ -147,8 +147,7 @@ def dash_to_camelcase(word):
def to_snake_case(name):
name = re.sub(r"([A-Z]{2,})([A-Z][a-z])", r"\1_\2", name)
- return re.sub(r"([a-z0-9])([A-Z])", r"\1_\2", name, sys.maxsize).lower()
-
+ return re.sub(r"([a-z0-9])([A-Z])", r"\1_\2", name, count=sys.maxsize).lower()
def to_method_case(config, name):
if config.use_title_case_methods:

@ -0,0 +1,32 @@
diff -up chromium-129.0.6668.42.old/media/filters/ffmpeg_glue.cc.me chromium-129.0.6668.42.old/media/filters/ffmpeg_glue.cc
--- chromium-129.0.6668.42.old/media/filters/ffmpeg_glue.cc.me 2024-09-15 22:12:33.945186323 +0200
+++ chromium-129.0.6668.42.old/media/filters/ffmpeg_glue.cc 2024-09-16 10:53:13.334970539 +0200
@@ -17,14 +17,11 @@
namespace media {
-// Kill switches in case things explode. Remove after M132.
+// Kill switch in case things explode. Remove after M132.
// TODO(crbug.com/355485812): Re-enable this flag.
BASE_FEATURE(kAllowOnlyAudioCodecsDuringDemuxing,
"AllowOnlyAudioCodecsDuringDemuxing",
base::FEATURE_ENABLED_BY_DEFAULT);
-BASE_FEATURE(kForbidH264ParsingDuringDemuxing,
- "ForbidH264ParsingDuringDemuxing",
- base::FEATURE_ENABLED_BY_DEFAULT);
// Internal buffer size used by AVIO for reading.
// TODO(dalecurtis): Experiment with this buffer size and measure impact on
@@ -118,12 +115,6 @@ FFmpegGlue::FFmpegGlue(FFmpegURLProtocol
// Enable fast, but inaccurate seeks for MP3.
format_context_->flags |= AVFMT_FLAG_FAST_SEEK;
- // We don't allow H.264 parsing during demuxing since we have our own parser
- // and the ffmpeg one increases memory usage unnecessarily.
- if (base::FeatureList::IsEnabled(kForbidH264ParsingDuringDemuxing)) {
- format_context_->flags |= AVFMT_FLAG_NOH264PARSE;
- }
-
// Ensures format parsing errors will bail out. From an audit on 11/2017, all
// instances were real failures. Solves bugs like http://crbug.com/710791.
format_context_->error_recognition |= AV_EF_EXPLODE;

File diff suppressed because it is too large Load Diff

@ -1,8 +1,6 @@
Index: chromium-128.0.6613.113/third_party/dawn/src/dawn/common/Platform.h --- a/third_party/dawn/src/dawn/common/Platform.h
=================================================================== +++ b/third_party/dawn/src/dawn/common/Platform.h
--- chromium-128.0.6613.113.orig/third_party/dawn/src/dawn/common/Platform.h @@ -159,10 +159,12 @@
+++ chromium-128.0.6613.113/third_party/dawn/src/dawn/common/Platform.h
@@ -158,10 +158,12 @@
#elif defined(__s390x__) #elif defined(__s390x__)
#define DAWN_PLATFORM_IS_S390X 1 #define DAWN_PLATFORM_IS_S390X 1
@ -15,5 +13,5 @@ Index: chromium-128.0.6613.113/third_party/dawn/src/dawn/common/Platform.h
+#elif defined(__PPC__) +#elif defined(__PPC__)
+#define DAWN_PLATFORM_IS_PPC 1 +#define DAWN_PLATFORM_IS_PPC 1
#else #elif defined(__wasm32__)
#error "Unsupported platform." #define DAWN_PLATFORM_IS_WASM32 1

@ -1,16 +0,0 @@
Index: chromium-128.0.6613.113/third_party/dawn/src/dawn/common/Assert.cpp
===================================================================
--- chromium-128.0.6613.113.orig/third_party/dawn/src/dawn/common/Assert.cpp
+++ chromium-128.0.6613.113/third_party/dawn/src/dawn/common/Assert.cpp
@@ -52,9 +52,9 @@ void BreakPoint() {
__asm__ __volatile__("ebreak");
#elif DAWN_PLATFORM_IS(MIPS)
__asm__ __volatile__("break");
-#elif DAWN_PLATFORM_IS(S390) || DAWN_PLATFORM_IS_(S390X)
+#elif DAWN_PLATFORM_IS(S390) || DAWN_PLATFORM_IS(S390X)
__asm__ __volatile__(".word 0x0001");
-#elif DAWN_PLATFORM_IS(PPC) || DAWN_PLATFORM_IS_(PPC64)
+#elif DAWN_PLATFORM_IS(PPC) || DAWN_PLATFORM_IS(PPC64)
__asm__ __volatile__("twge 2,2");
#else
#error "Unsupported platform"

@ -296,7 +296,7 @@
# Build with GOST patches # Build with GOST patches
# https://github.com/deemru/chromium-gost/ # https://github.com/deemru/chromium-gost/
%global gost_build 1 %global gost_build 1
%define chromium_gost_commit 648cc5b901f2447b9b12bc5b09b962ec802b025a %define chromium_gost_commit 124a371049d7a087a24f25ee4c5ed51c897a157b
%define msspi_commit e91bd46306cc7044b2903cd07b788c13c36481e3 %define msspi_commit e91bd46306cc7044b2903cd07b788c13c36481e3
%define chromium_path_gost %{_builddir}/chromium-gost %define chromium_path_gost %{_builddir}/chromium-gost
%endif %endif
@ -335,8 +335,8 @@
%endif %endif
Name: chromium%{chromium_channel} Name: chromium%{chromium_channel}
Version: 128.0.6613.137 Version: 129.0.6668.58
Release: 1%{?dist}.inferit.1 Release: 1%{?dist}.inferit
Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
Url: http://www.chromium.org/Home Url: http://www.chromium.org/Home
License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only) License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only)
@ -372,6 +372,9 @@ Patch90: chromium-121-system-libxml.patch
# patch for using system opus # patch for using system opus
Patch91: chromium-108-system-opus.patch Patch91: chromium-108-system-opus.patch
# python-3,13, Deprecationwarning: 'count' is passed as positionaö argument
Patch100: chromium-128.0.6613.137-python-3.13-warning.patch
# system ffmpeg # system ffmpeg
# need for old ffmpeg 5.x on epel9 # need for old ffmpeg 5.x on epel9
Patch129: chromium-125-ffmpeg-5.x-reordered_opaque.patch Patch129: chromium-125-ffmpeg-5.x-reordered_opaque.patch
@ -384,6 +387,8 @@ Patch132: chromium-118-sigtrap_system_ffmpeg.patch
Patch133: chromium-121-system-old-ffmpeg.patch Patch133: chromium-121-system-old-ffmpeg.patch
# disable FFmpegAllowLists by default to allow external ffmpeg # disable FFmpegAllowLists by default to allow external ffmpeg
patch134: chromium-125-disable-FFmpegAllowLists.patch patch134: chromium-125-disable-FFmpegAllowLists.patch
# revert, it causes build error: use of undeclared identifier 'AVFMT_FLAG_NOH264PARSE'
Patch135: chromium-129-disable-H.264-video-parser-during-demuxing.patch
# file conflict with old kernel on el8/el9 # file conflict with old kernel on el8/el9
Patch141: chromium-118-dma_buf_export_sync_file-conflict.patch Patch141: chromium-118-dma_buf_export_sync_file-conflict.patch
@ -395,6 +400,8 @@ Patch150: chromium-124-qt6.patch
# it is not supported in old glibc < 2.30, error: fatal error: 'sys/ifunc.h' file not found # it is not supported in old glibc < 2.30, error: fatal error: 'sys/ifunc.h' file not found
Patch305: chromium-124-el8-arm64-memory_tagging.patch Patch305: chromium-124-el8-arm64-memory_tagging.patch
Patch306: chromium-127-el8-ifunc-header.patch Patch306: chromium-127-el8-ifunc-header.patch
# workaround for build error due to old atk version on el8
Patch307: chromium-129-el8-atk-compiler-error.patch
# enable fstack-protector-strong # enable fstack-protector-strong
Patch312: chromium-123-fstack-protector-strong.patch Patch312: chromium-123-fstack-protector-strong.patch
@ -411,9 +418,6 @@ Patch353: chromium-127-aarch64-duplicate-case-value.patch
# remove flag split-threshold-for-reg-with-hint, it's not supported in clang <= 17 # remove flag split-threshold-for-reg-with-hint, it's not supported in clang <= 17
Patch354: chromium-126-split-threshold-for-reg-with-hint.patch Patch354: chromium-126-split-threshold-for-reg-with-hint.patch
# use system libstdc++
Patch355: chromium-126-system-libstdc++.patch
# set clang_lib path # set clang_lib path
Patch358: chromium-127-rust-clanglib.patch Patch358: chromium-127-rust-clanglib.patch
@ -484,12 +488,12 @@ Patch407: 0002-Add-ppc64-trap-instructions.patch
Patch408: fix-ppc64-linux-syscalls-headers.patch Patch408: fix-ppc64-linux-syscalls-headers.patch
Patch409: use-sysconf-page-size-on-ppc64.patch Patch409: use-sysconf-page-size-on-ppc64.patch
Patch410: dawn-fix-typos.patch
Patch411: dawn-fix-ppc64le-detection.patch Patch411: dawn-fix-ppc64le-detection.patch
Patch412: add-ppc64-architecture-to-extensions.diff Patch412: add-ppc64-architecture-to-extensions.diff
# Suppress harmless compiler warning messages that appear on ppc64 due to arch-specific warning flags being passed # Suppress harmless compiler warning messages that appear on ppc64 due to arch-specific warning flags being passed
Patch413: fix-unknown-warning-option-messages.diff Patch413: fix-unknown-warning-option-messages.diff
Patch414: cargo-add-ppc64.diff
# Old Yandex patch # Old Yandex patch
Patch600: 0001-Yandex-as-default-search-engine.patch Patch600: 0001-Yandex-as-default-search-engine.patch
@ -703,6 +707,10 @@ BuildRequires: libappstream-glib
BuildRequires: libstdc++-static BuildRequires: libstdc++-static
%endif %endif
%if ! %{use_custom_libcxx}
BuildRequires: libcxx-devel
%endif
# Fedora tries to use system libs whenever it can. # Fedora tries to use system libs whenever it can.
BuildRequires: bzip2-devel BuildRequires: bzip2-devel
BuildRequires: dbus-glib-devel BuildRequires: dbus-glib-devel
@ -1188,6 +1196,10 @@ sed -i 's/std::string data_dir_basename = "chromium"/std::string data_dir_basena
%patch -P91 -p1 -b .system-opus %patch -P91 -p1 -b .system-opus
%endif %endif
%if 0%{?fedora}
%patch -P100 -p1 -b .python-3.13-warning
%endif
%if 0%{?rhel} == 8 || 0%{?rhel} == 9 %if 0%{?rhel} == 8 || 0%{?rhel} == 9
%patch -P141 -p1 -b .dma_buf_export_sync_file-conflict %patch -P141 -p1 -b .dma_buf_export_sync_file-conflict
%endif %endif
@ -1199,6 +1211,7 @@ sed -i 's/std::string data_dir_basename = "chromium"/std::string data_dir_basena
#%%patch -P130 -p1 -b .revert-av1enc #%%patch -P130 -p1 -b .revert-av1enc
#%%patch -P133 -p1 -b .system-old-ffmpeg #%%patch -P133 -p1 -b .system-old-ffmpeg
#%%patch -P134 -p1 -b .disable-FFmpegAllowLists #%%patch -P134 -p1 -b .disable-FFmpegAllowLists
#%%patch -P135 -p1 -b .disable-H.264-video-parser-during-demuxing
#%%endif #%%endif
#%%endif #%%endif
@ -1211,6 +1224,7 @@ sed -i 's/std::string data_dir_basename = "chromium"/std::string data_dir_basena
%patch -P305 -p1 -b .el8-memory_tagging %patch -P305 -p1 -b .el8-memory_tagging
%patch -P306 -p1 -b .el8-ifunc-header %patch -P306 -p1 -b .el8-ifunc-header
%endif %endif
%patch -P307 -p1 -b .el8-atk-compiler-error
%endif %endif
%patch -P312 -p1 -b .fstack-protector-strong %patch -P312 -p1 -b .fstack-protector-strong
@ -1229,9 +1243,6 @@ sed -i 's/std::string data_dir_basename = "chromium"/std::string data_dir_basena
%patch -P354 -p1 -b .split-threshold-for-reg-with-hint %patch -P354 -p1 -b .split-threshold-for-reg-with-hint
%endif %endif
%if ! %{use_custom_libcxx}
%patch -P355 -p1 -b .system-libstdc++
%endif
%patch -P358 -p1 -b .rust-clang_lib %patch -P358 -p1 -b .rust-clang_lib
%patch -P359 -p1 -b .libavif-deps %patch -P359 -p1 -b .libavif-deps
@ -1287,11 +1298,10 @@ sed -i 's/std::string data_dir_basename = "chromium"/std::string data_dir_basena
%patch -P407 -p1 -b .0002-Add-ppc64-trap-instructions %patch -P407 -p1 -b .0002-Add-ppc64-trap-instructions
%patch -P408 -p1 -b .fix-ppc64-linux-syscalls-headers %patch -P408 -p1 -b .fix-ppc64-linux-syscalls-headers
%patch -P409 -p1 -b .use-sysconf-page-size-on-ppc64 %patch -P409 -p1 -b .use-sysconf-page-size-on-ppc64
%patch -P410 -p1 -b .dawn-fix-typos
%patch -P411 -p1 -b .dawn-fix-ppc64le-detection %patch -P411 -p1 -b .dawn-fix-ppc64le-detection
%patch -P412 -p1 -b .add-ppc64-architecture-to-extensions %patch -P412 -p1 -b .add-ppc64-architecture-to-extensions
%patch -P413 -p1 -b .fix-unknown-warning-option-messages %patch -P413 -p1 -b .fix-unknown-warning-option-messages
%patch -P414 -p1 -b .fix-swiftshader-compile %patch -P414 -p1 -b .rust-add-ppc64-case
%endif %endif
%patch -P601 -p1 -b .Added-Russian-description-and-summary-for-gnome-soft %patch -P601 -p1 -b .Added-Russian-description-and-summary-for-gnome-soft
@ -1413,6 +1423,11 @@ CFLAGS="$FLAGS"
CXXFLAGS="$FLAGS" CXXFLAGS="$FLAGS"
%endif %endif
%if ! %{use_custom_libcxx}
CXXFLAGS="$FLAGS -stdlib=libc++"
LDFLAGS="$LDFLAGS -stdlib=libc++"
%endif
%ifarch ppc64le %ifarch ppc64le
CXXFLAGS+=' -faltivec-src-compat=mixed -Wno-deprecated-altivec-src-compat' CXXFLAGS+=' -faltivec-src-compat=mixed -Wno-deprecated-altivec-src-compat'
%endif %endif
@ -2149,6 +2164,15 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%endif %endif
%changelog %changelog
* Thu Sep 19 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 129.0.6668.58-1.inferit
- update to 129.0.6668.58
* High CVE-2024-8904: Type Confusion in V8
* Medium CVE-2024-8905: Inappropriate implementation in V8
* Medium CVE-2024-8906: Incorrect security UI in Downloads
* Medium CVE-2024-8907: Insufficient data validation in Omnibox
* Low CVE-2024-8908: Inappropriate implementation in Autofill
* Low CVE-2024-8909: Inappropriate implementation in UI
* Wed Sep 11 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 128.0.6613.137-1.inferit * Wed Sep 11 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 128.0.6613.137-1.inferit
- update to 128.0.6613.137 - update to 128.0.6613.137
* High CVE-2024-8636: Heap buffer overflow in Skia * High CVE-2024-8636: Heap buffer overflow in Skia

Loading…
Cancel
Save