diff --git a/.chromium.metadata b/.chromium.metadata index 46e65fdc..a02e3baf 100644 --- a/.chromium.metadata +++ b/.chromium.metadata @@ -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 -9bd36edf9f2e882aad828ad88faa7b9d02566cea SOURCES/Chromium-Gost-648cc5b901f2447b9b12bc5b09b962ec802b025a.tar.xz +3b3602227af2be24789daeedf42ae02c2f6e29e9 SOURCES/Chromium-Gost-124a371049d7a087a24f25ee4c5ed51c897a157b.tar.xz dea187019741602d57aaf189a80abba261fbd2aa SOURCES/linux-x64-0.19.2.tgz 7e5d2c7864c5c83ec789b59c77cd9c20d2594916 SOURCES/linux-arm64-0.19.2.tgz 769196d081c6a0ad37f1c63dec56febfff3370de SOURCES/node-v20.6.1-linux-x64.tar.xz diff --git a/.gitignore b/.gitignore index b26bbd35..545225f4 100644 --- a/.gitignore +++ b/.gitignore @@ -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-arm64-0.19.2.tgz SOURCES/node-v20.6.1-linux-x64.tar.xz SOURCES/node-v20.6.1-linux-arm64.tar.xz SOURCES/chromium-browser-gost-icons.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-x86_64.tar.xz diff --git a/SOURCES/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch b/SOURCES/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch index 52c50723..5fd44ff8 100644 --- a/SOURCES/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch +++ b/SOURCES/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch @@ -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 -+++ 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 @@ +; -+; 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 +; 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_SHARED equ 0 +CONFIG_SIZE_LIMIT equ 1 -+CONFIG_SPATIAL_RESAMPLING equ 1 +CONFIG_SPEED_STATS equ 0 ++CONFIG_SVT_AV1 equ 1 +CONFIG_TFLITE equ 0 +CONFIG_THREE_PASS 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_WXWIDGETS 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 -+++ 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 @@ +/* -+ * 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 + * 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" +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;} -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 -+++ chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/config/aom_config.h -@@ -0,0 +1,99 @@ ++++ chromium-129.0.6668.42/third_party/libaom/source/config/linux/ppc64/config/aom_config.h +@@ -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 + * 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_SHARED 0 +#define CONFIG_SIZE_LIMIT 1 -+#define CONFIG_SPATIAL_RESAMPLING 1 +#define CONFIG_SPEED_STATS 0 ++#define CONFIG_SVT_AV1 1 +#define CONFIG_TFLITE 0 +#define CONFIG_THREE_PASS 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_VSX 1 +#define HAVE_WXWIDGETS 0 -+#define INLINE inline +#define STATIC_LINK_JXL 0 +#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 -+++ chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h -@@ -0,0 +1,1541 @@ ++++ chromium-129.0.6668.42/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h +@@ -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. +#ifndef 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); +#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); +#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); +#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); +#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); +#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); +#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); +#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); +#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); +#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); +#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); +#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); +#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); +#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); +#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); +#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); +#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); +#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); +#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); +#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 -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 -+++ chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h -@@ -0,0 +1,107 @@ ++++ chromium-129.0.6668.42/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h +@@ -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. +#ifndef 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); +#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); +#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 -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 -+++ chromium-128.0.6613.113/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h -@@ -0,0 +1,484 @@ ++++ chromium-129.0.6668.42/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h +@@ -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. +#ifndef 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); +#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); +#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); +#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); +#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); +#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); +#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); +#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 + +bool av1_resize_vert_dir_c(uint8_t *intbuf, uint8_t *output, int out_stride, int height, int height2, int width2, int start_col); diff --git a/SOURCES/0001-Added-Yandex-search-bar-as-default-on-newtab-and-new.patch b/SOURCES/0001-Added-Yandex-search-bar-as-default-on-newtab-and-new.patch index 4adac614..6a59b317 100644 --- a/SOURCES/0001-Added-Yandex-search-bar-as-default-on-newtab-and-new.patch +++ b/SOURCES/0001-Added-Yandex-search-bar-as-default-on-newtab-and-new.patch @@ -1,6 +1,6 @@ -From 24fca3c63c8240c9e4214163947f71a404300ac1 Mon Sep 17 00:00:00 2001 +From d809986ff97aad30883b88e24509172492cc0f33 Mon Sep 17 00:00:00 2001 From: tigro -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 --- @@ -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/template_url_data_util.cc | 6 +++++- .../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(-) 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 +++ 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 @@ -45,10 +45,10 @@ index 366de3cb51..f1b7148608 100644 Add to your search 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 +++ b/chrome/app/resources/generated_resources_be.xtb -@@ -9669,7 +9669,7 @@ +@@ -9739,7 +9739,7 @@ Стварайце рэзервовыя копіі сваіх даных, каб іх можна было выкарыстоўваць на іншых прыладах Стварыце ярлык на працоўным стале прылады, каб мець прамы доступ да гэтага профілю Падключыце клавіятуру або мыш. Калі вы выкарыстоўваеце прылады з Bluetooth, упэўніцеся, што яны гатовыя да спалучэння. @@ -57,7 +57,7 @@ index cf57c86031..5c700fad3d 100644 У Google пашырэнне "" абазначана як шкоднае. Яго ўсталяванне было прадухілена Адваротная прагортка сэнсарнай панэллю Камерцыйнае падпісванне кода ў Microsoft -@@ -11412,4 +11412,4 @@ +@@ -11493,4 +11493,4 @@ Пры наведванні сайтаў яны будуць аўтаматычна ўлічваць гэту наладу. Звычайна сайты адпраўляюць апавяшчэнні, каб паведаміць вам пра экстранныя навіны або новыя паведамленні ў чаце. Каб выкарыстоўваць функцыю сінхранізацыі параметраў Wi-Fi, уключыце Сінхранізацыю Chrome. Даведацца больш Пра&верыць @@ -65,10 +65,10 @@ index cf57c86031..5c700fad3d 100644 \ No newline at end of file + 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 +++ 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 Back up your stuff and use it on any device Create a desktop shortcut on your device to access directly to this profile Connect a keyboard or mouse. If you are using Bluetooth devices, make sure that your devices are ready to pair. @@ -78,10 +78,10 @@ index c637034755..94eb5e6a86 100644 Touchpad reverse scrolling Microsoft Commercial Code Signing 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 +++ b/chrome/app/resources/generated_resources_ru.xtb -@@ -9673,7 +9673,7 @@ +@@ -9743,7 +9743,7 @@ Создайте резервную копию данных и используйте их на любом устройстве. Чтобы быстро переключаться на этот профиль, создайте ярлык на рабочем столе Подключите мышь или клавиатуру. Если вы используете устройства Bluetooth, убедитесь, что они готовы к подключению. @@ -91,10 +91,10 @@ index 759b1346db..27e6f4b72c 100644 Обратное направление прокрутки с помощью сенсорной панели Подписывание коммерческого кода Microsoft 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 +++ b/chrome/app/resources/generated_resources_uk.xtb -@@ -9683,7 +9683,7 @@ +@@ -9753,7 +9753,7 @@ Створюйте резервні копії даних і використовуйте їх на будь-якому пристрої Створити ярлик на робочому столі, щоб відразу переходити до цього профілю Підключіть клавіатуру або мишу. Якщо ви користуєтеся пристроями з Bluetooth, переконайтеся, що вони готові до підключення. @@ -104,10 +104,10 @@ index 34039a1a6d..84b33f4e51 100644 Зворотне прокручування на сенсорній панелі Підписування комерційного коду Microsoft 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 +++ b/chrome/browser/history/top_sites_factory.cc -@@ -54,7 +54,7 @@ struct RawPrepopulatedPage { +@@ -59,7 +59,7 @@ struct RawPrepopulatedPage { // roughly match favicon). }; @@ -116,7 +116,7 @@ index 0da9ce7baf..7ade1ebfe1 100644 // Android does not use prepopulated pages. const RawPrepopulatedPage kRawPrepopulatedPages[] = { { -@@ -69,7 +69,7 @@ const RawPrepopulatedPage kRawPrepopulatedPages[] = { +@@ -74,7 +74,7 @@ const RawPrepopulatedPage kRawPrepopulatedPages[] = { void InitializePrepopulatedPageList( Profile* profile, history::PrepopulatedPageList* prepopulated_pages) { @@ -232,7 +232,7 @@ index 412c9bcf2c..e0c27819a5 100644 private computeShowDoodle_(): boolean { 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 +++ b/chrome/browser/search/search.cc @@ -174,6 +174,8 @@ struct NewTabURLDetails { @@ -270,10 +270,10 @@ index c7ae65114f..5859d72731 100644 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 -index b3304b0757..33e6a2fd41 100644 +index 2d64a60614..2785307858 100644 --- 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 -@@ -32,6 +32,7 @@ +@@ -37,6 +37,7 @@ #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_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/sync/sync_service_factory.h" #include "chrome/browser/themes/theme_service_factory.h" -@@ -421,6 +422,10 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) { - - source->AddBoolean("modulesRedesignedEnabled", redesigned_modules_enabled); +@@ -424,6 +425,10 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) { + base::NumberToString( + ntp_features::kNtpCalendarModuleWindowEndDeltaParam.Get().InHours())); + source->AddBoolean( + "googleLensForYandex", @@ -358,10 +358,10 @@ index d4f6038697..b493d4c587 100644 data->suggestions_url_post_params = s.ColumnString(18); data->image_url_post_params = s.ColumnString(19); 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 +++ 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}", "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", @@ -370,7 +370,7 @@ index 889d15f789..eb41d59f3c 100644 "type": "SEARCH_ENGINE_YANDEX", "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", "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", @@ -378,7 +378,7 @@ index 889d15f789..eb41d59f3c 100644 "type": "SEARCH_ENGINE_YANDEX", "id": 15 }, -@@ -699,7 +700,7 @@ +@@ -701,7 +702,7 @@ "suggest_url": "https://suggest.yandex.kz/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "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", @@ -387,7 +387,7 @@ index 889d15f789..eb41d59f3c 100644 "type": "SEARCH_ENGINE_YANDEX", "id": 15 }, -@@ -713,7 +714,7 @@ +@@ -715,7 +716,7 @@ "suggest_url": "https://suggest.yandex.ru/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "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", @@ -396,7 +396,7 @@ index 889d15f789..eb41d59f3c 100644 "type": "SEARCH_ENGINE_YANDEX", "id": 15 }, -@@ -726,7 +727,7 @@ +@@ -728,7 +729,7 @@ "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_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", "id": 15 }, -@@ -740,7 +741,7 @@ +@@ -742,7 +743,7 @@ "suggest_url": "https://suggest.yandex.ua/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "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", @@ -415,10 +415,10 @@ index 889d15f789..eb41d59f3c 100644 "id": 15 }, 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 +++ 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) constexpr EngineAndTier engines_default[] = { @@ -426,7 +426,7 @@ index 6c8ffb9e7d..417cb0009c 100644 {SearchEngineTier::kTopEngines, &google}, {SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &yahoo}, -@@ -169,8 +170,8 @@ constexpr EngineAndTier engines_BR[] = { +@@ -174,8 +175,8 @@ constexpr EngineAndTier engines_BR[] = { // Belarus constexpr EngineAndTier engines_BY[] = { @@ -436,7 +436,7 @@ index 6c8ffb9e7d..417cb0009c 100644 {SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &duckduckgo}, {SearchEngineTier::kTopEngines, &mail_ru}, -@@ -494,9 +495,9 @@ constexpr EngineAndTier engines_IN[] = { +@@ -499,9 +500,9 @@ constexpr EngineAndTier engines_IN[] = { // Iraq constexpr EngineAndTier engines_IQ[] = { @@ -447,7 +447,7 @@ index 6c8ffb9e7d..417cb0009c 100644 {SearchEngineTier::kTopEngines, &yahoo}, {SearchEngineTier::kTopEngines, &duckduckgo}, }; -@@ -590,8 +591,8 @@ constexpr EngineAndTier engines_KW[] = { +@@ -595,8 +596,8 @@ constexpr EngineAndTier engines_KW[] = { // Kazakhstan constexpr EngineAndTier engines_KZ[] = { @@ -457,7 +457,7 @@ index 6c8ffb9e7d..417cb0009c 100644 {SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &mail_ru}, {SearchEngineTier::kTopEngines, &yahoo}, -@@ -1007,8 +1008,8 @@ constexpr EngineAndTier engines_TN[] = { +@@ -1012,8 +1013,8 @@ constexpr EngineAndTier engines_TN[] = { // Turkey constexpr EngineAndTier engines_TR[] = { @@ -468,10 +468,10 @@ index 6c8ffb9e7d..417cb0009c 100644 {SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &duckduckgo}, 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 +++ b/components/search_engines/template_url_data_util.cc -@@ -75,10 +75,12 @@ std::unique_ptr TemplateURLDataFromDictionary( +@@ -80,10 +80,12 @@ std::unique_ptr TemplateURLDataFromDictionary( if (string_value) { result->image_translate_url = *string_value; } @@ -484,7 +484,7 @@ index 6f85515188..0657dc9d5a 100644 string_value = dict.FindString(DefaultSearchManager::kContextualSearchURL); if (string_value) { result->contextual_search_url = *string_value; -@@ -347,7 +349,7 @@ std::unique_ptr TemplateURLDataFromPrepopulatedEngine( +@@ -352,7 +354,7 @@ std::unique_ptr TemplateURLDataFromPrepopulatedEngine( ToStringPiece(engine.search_url), ToStringPiece(engine.suggest_url), ToStringPiece(engine.image_url), ToStringPiece(engine.image_translate_url), @@ -493,7 +493,7 @@ index 6f85515188..0657dc9d5a 100644 ToStringPiece(engine.contextual_search_url), ToStringPiece(engine.logo_url), ToStringPiece(engine.doodle_url), ToStringPiece(engine.search_url_post_params), -@@ -438,10 +440,12 @@ std::unique_ptr TemplateURLDataFromOverrideDictionary( +@@ -444,10 +446,12 @@ std::unique_ptr TemplateURLDataFromOverrideDictionary( if (string_value) { image_translate_url = *string_value; } @@ -507,10 +507,10 @@ index 6f85515188..0657dc9d5a 100644 if (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 -index 964626cc24..d4d09dc1bd 100644 +index ca355f2b9c..170f14b3dd 100644 --- a/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); CHECK_LE(t_urls.size(), kMaxEeaPrepopulatedEngines); @@ -524,7 +524,7 @@ index 964626cc24..d4d09dc1bd 100644 return t_urls; } -@@ -323,7 +330,7 @@ std::unique_ptr GetPrepopulatedFallbackSearch( +@@ -328,7 +335,7 @@ std::unique_ptr GetPrepopulatedFallbackSearch( PrefService* prefs, search_engines::SearchEngineChoiceService* search_engine_choice_service) { return FindPrepopulatedEngineInternal(prefs, search_engine_choice_service, @@ -533,10 +533,10 @@ index 964626cc24..d4d09dc1bd 100644 /*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 -index 6dce798dcc..0f6ee046fb 100644 ---- 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 8c88f273b9..d5187f33c0 100644 +--- a/ui/webui/resources/cr_components/searchbox/searchbox.html ++++ b/ui/webui/resources/cr_components/searchbox/searchbox.html @@ -1,4 +1,11 @@