From f023626fb0f042f336c16fe7419755dbd2868051 Mon Sep 17 00:00:00 2001 From: Alexander Frick Date: Sat, 30 Nov 2024 01:28:44 -0600 Subject: [PATCH] post RC1 fixes --- arm/build/config/compiler/BUILD.gn | 6 +- infra/DEBUG/build_debug_linux.sh | 1 + infra/DEBUG/build_debug_shell_linux.sh | 1 + infra/DEBUG/build_debug_shell_win.sh | 1 + infra/DEBUG/build_debug_win.sh | 1 + other/AVX2/win_AVX2_args.gn | 2 +- other/AVX512/win_AVX512_args.gn | 2 +- other/SSE2/win32_SSE2_args.gn | 2 +- other/SSE3/win32_SSE3_args.gn | 2 +- other/SSE3/win64_SSE3_args.gn | 2 +- other/SSE4.1/win_SSE4.1_args.gn | 2 +- other/SSE4.2/win_SSE4.2_args.gn | 2 +- other/thorium-2024-ui.patch | 6 +- src/build/config/compiler/BUILD.gn | 6 +- src/chrome/browser/thorium_flag_entries.h | 9 + src/components/vector_icons/BUILD.gn | 2 + .../vector_icons/bookmark_folder.icon | 55 +++++++ .../vector_icons/folder_managed.icon | 154 ++++++++++++++++++ .../vector_icons/thorium/restore_tab.bak | 36 ++++ .../vector_icons/thorium/restore_tab.icon | 55 +++---- win_args.gn | 2 +- 21 files changed, 299 insertions(+), 50 deletions(-) create mode 100644 src/components/vector_icons/bookmark_folder.icon create mode 100644 src/components/vector_icons/folder_managed.icon create mode 100644 src/components/vector_icons/thorium/restore_tab.bak diff --git a/arm/build/config/compiler/BUILD.gn b/arm/build/config/compiler/BUILD.gn index acbfc9f0..f91cf89e 100644 --- a/arm/build/config/compiler/BUILD.gn +++ b/arm/build/config/compiler/BUILD.gn @@ -1090,13 +1090,13 @@ config("compiler") { rustflags += [ "-Ctarget-feature=+sse3,+ssse3,+sse4.1,+sse4.2", ] } if (use_avx) { - rustflags += [ "-Ctarget-feature=+sse3,+ssse3,+sse4.1,+sse4.2,+aes,+avx", ] + rustflags += [ "-Ctarget-feature=+sse3,+ssse3,+sse4.1,+sse4.2,+pclmulqdq,+aes,+avx", ] } if (use_avx2) { - rustflags += [ "-Ctarget-feature=+sse3,+ssse3,+sse4.1,+sse4.2,+aes,+avx,+avx2,+fma,+f16c,+lzcnt,+bmi2", "-Cllvm-args=-fp-contract=fast", ] + rustflags += [ "-Ctarget-feature=+sse3,+ssse3,+sse4.1,+sse4.2,+pclmulqdq,+aes,+avx,+avx2,+fma,+f16c,+lzcnt,+bmi2", "-Cllvm-args=-fp-contract=fast", ] } if (use_avx512) { - rustflags += [ "-Ctarget-feature=+sse3,+ssse3,+sse4.1,+sse4.2,+aes,+avx,+avx2,+fma,+f16c,+lzcnt,+bmi2,+mavx512f,+-mavx512vl", "-Cllvm-args=-fp-contract=fast", ] + rustflags += [ "-Ctarget-feature=+sse3,+ssse3,+sse4.1,+sse4.2,+pclmulqdq,+aes,+avx,+avx2,+fma,+f16c,+lzcnt,+bmi2,+mavx512f", "-Cllvm-args=-fp-contract=fast", ] } if (!is_win || force_rustc_color_output) { diff --git a/infra/DEBUG/build_debug_linux.sh b/infra/DEBUG/build_debug_linux.sh index 01d1e291..3a5acadb 100755 --- a/infra/DEBUG/build_debug_linux.sh +++ b/infra/DEBUG/build_debug_linux.sh @@ -84,5 +84,6 @@ cp -r -f -v ~/chromium/src/out/thorium/views_examples_resources.pak ~/chromium/s cp -r -f -v ~/chromium/src/out/thorium/thorium_ui_debug_shell ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ && cp -r -f -v ClearKeyCdm ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ && +printf "\n" && printf "${GRE}Debug Linux Build Completed.\n" && tput sgr0 diff --git a/infra/DEBUG/build_debug_shell_linux.sh b/infra/DEBUG/build_debug_shell_linux.sh index f8636e29..8bddaa85 100755 --- a/infra/DEBUG/build_debug_shell_linux.sh +++ b/infra/DEBUG/build_debug_shell_linux.sh @@ -90,5 +90,6 @@ cp -r -f -v ${CR_SRC_DIR}/out/thorium/ClearKeyCdm/_platform_specific/linux_x64/l cd ${CR_SRC_DIR}/out/thorium/Thorium_UI_Debug_Shell && zip -r ../Thorium_UI_Debug_Shell.zip * && +printf "\n" && printf "${GRE}Thorium UI Debug Shell Build Completed!\n" && tput sgr0 diff --git a/infra/DEBUG/build_debug_shell_win.sh b/infra/DEBUG/build_debug_shell_win.sh index 6bb107c5..7505cfd0 100755 --- a/infra/DEBUG/build_debug_shell_win.sh +++ b/infra/DEBUG/build_debug_shell_win.sh @@ -72,5 +72,6 @@ cp -r -f -v ${CR_SRC_DIR}/out/thorium/thorium_ui_debug_shell.exe ${CR_SRC_DIR}/o cd ${CR_SRC_DIR}/out/thorium/Thorium_UI_Debug_Shell && zip -r ../Thorium_UI_Debug_Shell.zip * && +printf "\n" && printf "${GRE}Thorium UI Debug Shell Build Completed!\n" && tput sgr0 diff --git a/infra/DEBUG/build_debug_win.sh b/infra/DEBUG/build_debug_win.sh index 4b733fba..3e505baf 100755 --- a/infra/DEBUG/build_debug_win.sh +++ b/infra/DEBUG/build_debug_win.sh @@ -67,5 +67,6 @@ cp -r -f -v ~/chromium/src/out/thorium/ui_test_200_percent.pak ~/chromium/src/ou cp -r -f -v ~/chromium/src/out/thorium/views_examples_resources.pak ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ && cp -r -f -v ~/chromium/src/out/thorium/thorium_ui_debug_shell.exe ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ && +printf "\n" && printf "${GRE}Debug Windows Build Completed.\n" && tput sgr0 diff --git a/other/AVX2/win_AVX2_args.gn b/other/AVX2/win_AVX2_args.gn index 32980481..9be57e90 100644 --- a/other/AVX2/win_AVX2_args.gn +++ b/other/AVX2/win_AVX2_args.gn @@ -85,4 +85,4 @@ use_thin_lto = true thin_lto_enable_optimizations = true enable_rust = true chrome_pgo_phase = 2 -pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-6723-1732295315-4ad8ea43591155058b0ae154377eb7ba9f82d617-74da9411216ab49f72b5ea57c6e907e5cf436f73.profdata" +pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-6723-1732380281-69c4b8e7155e0c5c5cc3228c3a832212136cdd7c-1d82f3f10d1e206a7d99e1b5122a997bec34666a.profdata" diff --git a/other/AVX512/win_AVX512_args.gn b/other/AVX512/win_AVX512_args.gn index 5808d0c3..d7da4e23 100644 --- a/other/AVX512/win_AVX512_args.gn +++ b/other/AVX512/win_AVX512_args.gn @@ -85,4 +85,4 @@ use_thin_lto = true thin_lto_enable_optimizations = true enable_rust = true chrome_pgo_phase = 2 -pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-6723-1732295315-4ad8ea43591155058b0ae154377eb7ba9f82d617-74da9411216ab49f72b5ea57c6e907e5cf436f73.profdata" +pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-6723-1732380281-69c4b8e7155e0c5c5cc3228c3a832212136cdd7c-1d82f3f10d1e206a7d99e1b5122a997bec34666a.profdata" diff --git a/other/SSE2/win32_SSE2_args.gn b/other/SSE2/win32_SSE2_args.gn index 09952487..fbacf167 100644 --- a/other/SSE2/win32_SSE2_args.gn +++ b/other/SSE2/win32_SSE2_args.gn @@ -86,4 +86,4 @@ use_thin_lto = true thin_lto_enable_optimizations = true enable_rust = true chrome_pgo_phase = 2 -pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win32-6723-1732295315-a3131454c698e2889775c4fe2ad91d439b4b44a2-74da9411216ab49f72b5ea57c6e907e5cf436f73.profdata" +pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win32-6723-1732380281-4d6352df69edcb48d13af2a2d8eb4f93743a68a2-1d82f3f10d1e206a7d99e1b5122a997bec34666a.profdata" diff --git a/other/SSE3/win32_SSE3_args.gn b/other/SSE3/win32_SSE3_args.gn index 9bee9c56..351e8995 100644 --- a/other/SSE3/win32_SSE3_args.gn +++ b/other/SSE3/win32_SSE3_args.gn @@ -85,4 +85,4 @@ use_thin_lto = true thin_lto_enable_optimizations = true enable_rust = true chrome_pgo_phase = 2 -pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win32-6723-1732295315-a3131454c698e2889775c4fe2ad91d439b4b44a2-74da9411216ab49f72b5ea57c6e907e5cf436f73.profdata" +pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win32-6723-1732380281-4d6352df69edcb48d13af2a2d8eb4f93743a68a2-1d82f3f10d1e206a7d99e1b5122a997bec34666a.profdata" diff --git a/other/SSE3/win64_SSE3_args.gn b/other/SSE3/win64_SSE3_args.gn index cf4df880..e06b4fd3 100644 --- a/other/SSE3/win64_SSE3_args.gn +++ b/other/SSE3/win64_SSE3_args.gn @@ -85,4 +85,4 @@ use_thin_lto = true thin_lto_enable_optimizations = true enable_rust = true chrome_pgo_phase = 2 -pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-6723-1732295315-4ad8ea43591155058b0ae154377eb7ba9f82d617-74da9411216ab49f72b5ea57c6e907e5cf436f73.profdata" +pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-6723-1732380281-69c4b8e7155e0c5c5cc3228c3a832212136cdd7c-1d82f3f10d1e206a7d99e1b5122a997bec34666a.profdata" diff --git a/other/SSE4.1/win_SSE4.1_args.gn b/other/SSE4.1/win_SSE4.1_args.gn index 8ef9cec7..2f52f344 100644 --- a/other/SSE4.1/win_SSE4.1_args.gn +++ b/other/SSE4.1/win_SSE4.1_args.gn @@ -85,4 +85,4 @@ use_thin_lto = true thin_lto_enable_optimizations = true enable_rust = true chrome_pgo_phase = 2 -pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-6723-1732295315-4ad8ea43591155058b0ae154377eb7ba9f82d617-74da9411216ab49f72b5ea57c6e907e5cf436f73.profdata" +pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-6723-1732380281-69c4b8e7155e0c5c5cc3228c3a832212136cdd7c-1d82f3f10d1e206a7d99e1b5122a997bec34666a.profdata" diff --git a/other/SSE4.2/win_SSE4.2_args.gn b/other/SSE4.2/win_SSE4.2_args.gn index 67a1889f..f7abb935 100644 --- a/other/SSE4.2/win_SSE4.2_args.gn +++ b/other/SSE4.2/win_SSE4.2_args.gn @@ -85,4 +85,4 @@ use_thin_lto = true thin_lto_enable_optimizations = true enable_rust = true chrome_pgo_phase = 2 -pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-6723-1732295315-4ad8ea43591155058b0ae154377eb7ba9f82d617-74da9411216ab49f72b5ea57c6e907e5cf436f73.profdata" +pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-6723-1732380281-69c4b8e7155e0c5c5cc3228c3a832212136cdd7c-1d82f3f10d1e206a7d99e1b5122a997bec34666a.profdata" diff --git a/other/thorium-2024-ui.patch b/other/thorium-2024-ui.patch index 911b1e66..6426f563 100644 --- a/other/thorium-2024-ui.patch +++ b/other/thorium-2024-ui.patch @@ -2400,8 +2400,8 @@ index 65676013fece9..d45fc4f3e1754 100644 + //bottom -= Th24StrokeOffset; + } + #else -+ VLOG(0) << "Th24StrokeOffset on Windows is imperfect"; + if (features::IsThorium2024()) { ++ VLOG(0) << "Th24StrokeOffset on Windows is imperfect"; + constexpr float Th24StrokeOffset = 1.0f; + top -= Th24StrokeOffset; + //bottom -= Th24StrokeOffset; @@ -2417,10 +2417,10 @@ index 65676013fece9..d45fc4f3e1754 100644 +const gfx::FontList& TabStyleViewsImpl::GetFontList() const { + // Don't want to have to keep re-computing this value. -+ static const bool prominent_dark_mode_titles = ++ static const bool prominent_active_tab_titles = + base::CommandLine::ForCurrentProcess()->HasSwitch("prominent-active-tab-titles"); + -+ if (prominent_dark_mode_titles && tab_->IsActive()) { ++ if (prominent_active_tab_titles && tab_->IsActive()) { + return heavy_font_; + } + diff --git a/src/build/config/compiler/BUILD.gn b/src/build/config/compiler/BUILD.gn index acbfc9f0..f91cf89e 100644 --- a/src/build/config/compiler/BUILD.gn +++ b/src/build/config/compiler/BUILD.gn @@ -1090,13 +1090,13 @@ config("compiler") { rustflags += [ "-Ctarget-feature=+sse3,+ssse3,+sse4.1,+sse4.2", ] } if (use_avx) { - rustflags += [ "-Ctarget-feature=+sse3,+ssse3,+sse4.1,+sse4.2,+aes,+avx", ] + rustflags += [ "-Ctarget-feature=+sse3,+ssse3,+sse4.1,+sse4.2,+pclmulqdq,+aes,+avx", ] } if (use_avx2) { - rustflags += [ "-Ctarget-feature=+sse3,+ssse3,+sse4.1,+sse4.2,+aes,+avx,+avx2,+fma,+f16c,+lzcnt,+bmi2", "-Cllvm-args=-fp-contract=fast", ] + rustflags += [ "-Ctarget-feature=+sse3,+ssse3,+sse4.1,+sse4.2,+pclmulqdq,+aes,+avx,+avx2,+fma,+f16c,+lzcnt,+bmi2", "-Cllvm-args=-fp-contract=fast", ] } if (use_avx512) { - rustflags += [ "-Ctarget-feature=+sse3,+ssse3,+sse4.1,+sse4.2,+aes,+avx,+avx2,+fma,+f16c,+lzcnt,+bmi2,+mavx512f,+-mavx512vl", "-Cllvm-args=-fp-contract=fast", ] + rustflags += [ "-Ctarget-feature=+sse3,+ssse3,+sse4.1,+sse4.2,+pclmulqdq,+aes,+avx,+avx2,+fma,+f16c,+lzcnt,+bmi2,+mavx512f", "-Cllvm-args=-fp-contract=fast", ] } if (!is_win || force_rustc_color_output) { diff --git a/src/chrome/browser/thorium_flag_entries.h b/src/chrome/browser/thorium_flag_entries.h index f2b61f8f..60624808 100644 --- a/src/chrome/browser/thorium_flag_entries.h +++ b/src/chrome/browser/thorium_flag_entries.h @@ -47,6 +47,15 @@ "Remove Tab Search Button", "Removes the tabsearch button from the tabstrip.", kOsDesktop, SINGLE_VALUE_TYPE("remove-tabsearch-button")}, + +#if BUILDFLAG(IS_WIN) + {"tab-search-caption-button", + "Disable Windows Tab Search Caption Button", + "Disables the tab search caption button (i.e. the version of the button that's adjacent to, and mimics, the minimize/maximize/close buttons), and " + "restores the standard rounded tab search button on the right of the tabstrip.", + kOsDesktop, SINGLE_VALUE_TYPE("disable-caption-button")}, +#endif // BUILDFLAG(IS_WIN) + {"classic-omnibox", "Classic Omnibox UI", "Changes the omnibox shape to be more square.", diff --git a/src/components/vector_icons/BUILD.gn b/src/components/vector_icons/BUILD.gn index 216c6f79..738c06f0 100644 --- a/src/components/vector_icons/BUILD.gn +++ b/src/components/vector_icons/BUILD.gn @@ -34,6 +34,7 @@ aggregate_vector_icons("components_vector_icons") { "bluetooth_off_chrome_refresh.icon", "bluetooth_scanning.icon", "bluetooth_scanning_chrome_refresh.icon", + "bookmark_folder.icon", "business.icon", "business_chrome_refresh.icon", "call.icon", @@ -92,6 +93,7 @@ aggregate_vector_icons("components_vector_icons") { "fingerprint_off.icon", "folder.icon", "folder_chrome_refresh.icon", + "folder_managed.icon", "folder_managed_refresh.icon", "folder_open.icon", "font_download.icon", diff --git a/src/components/vector_icons/bookmark_folder.icon b/src/components/vector_icons/bookmark_folder.icon new file mode 100644 index 00000000..d6645a21 --- /dev/null +++ b/src/components/vector_icons/bookmark_folder.icon @@ -0,0 +1,55 @@ +// Copyright 2024 The Brave Authors and Alex313031 +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at http://mozilla.org/MPL/2.0/. + +CANVAS_DIMENSIONS, 24, +MOVE_TO, 20.33f, 20.67f, +H_LINE_TO, 3.67f, +CUBIC_TO, 2.75f, 20.67f, 2, 19.8f, 2, 18.89f, +V_LINE_TO, 5.66f, +CUBIC_TO, 2, 4.74f, 2.75f, 4, 3.67f, 4, +R_H_LINE_TO, 5.89f, +R_CUBIC_TO, 0.03f, 0, 0.05f, 0.01f, 0.08f, 0.02f, +R_ARC_TO, 0.8f, 0.8f, 0, 0, 1, 0.32f, 0.1f, +R_CUBIC_TO, 0.02f, 0.01f, 0.05f, 0.02f, 0.07f, 0.03f, +R_LINE_TO, 2.23f, 1.51f, +R_H_LINE_TO, 1.41f, +R_V_LINE_TO, -0.83f, +ARC_TO, 0.83f, 0.83f, 0, 0, 1, 14.5f, 4, +R_H_LINE_TO, 3.33f, +R_CUBIC_TO, 0.46f, 0, 0.83f, 0.37f, 0.83f, 0.83f, +R_V_LINE_TO, 0.83f, +R_H_LINE_TO, 1.67f, +R_CUBIC_TO, 0.92f, 0, 1.67f, 0.74f, 1.67f, 1.65f, +R_V_LINE_TO, 11.58f, +R_CUBIC_TO, 0, 0.91f, -0.75f, 1.78f, -1.67f, 1.78f, +CLOSE, +MOVE_TO, 17, 5.66f, +R_H_LINE_TO, -1.67f, +R_V_LINE_TO, 4.45f, +R_LINE_TO, 0.46f, -0.23f, +R_ARC_TO, 0.84f, 0.84f, 0, 0, 1, 0.75f, 0, +R_LINE_TO, 0.46f, 0.23f, +V_LINE_TO, 5.66f, +CLOSE, +R_MOVE_TO, 3.33f, 1.65f, +R_H_LINE_TO, -1.67f, +R_V_LINE_TO, 4.14f, +R_CUBIC_TO, 0, 0.29f, -0.15f, 0.55f, -0.39f, 0.7f, +R_ARC_TO, 0.84f, 0.84f, 0, 0, 1, -0.81f, 0.04f, +R_LINE_TO, -1.29f, -0.64f, +R_LINE_TO, -1.29f, 0.64f, +R_ARC_TO, 0.84f, 0.84f, 0, 0, 1, -0.81f, -0.04f, +R_ARC_TO, 0.82f, 0.82f, 0, 0, 1, -0.39f, -0.7f, +V_LINE_TO, 7.31f, +H_LINE_TO, 12, +R_ARC_TO, 0.83f, 0.83f, 0, 0, 1, -0.29f, -0.06f, +R_CUBIC_TO, -0.03f, -0.01f, -0.06f, -0.03f, -0.08f, -0.04f, +R_CUBIC_TO, -0.03f, -0.02f, -0.06f, -0.03f, -0.09f, -0.05f, +R_LINE_TO, -2.23f, -1.51f, +H_LINE_TO, 3.67f, +R_V_LINE_TO, 13.35f, +R_H_LINE_TO, 16.67f, +V_LINE_TO, 7.31f, +CLOSE diff --git a/src/components/vector_icons/folder_managed.icon b/src/components/vector_icons/folder_managed.icon new file mode 100644 index 00000000..395e9c70 --- /dev/null +++ b/src/components/vector_icons/folder_managed.icon @@ -0,0 +1,154 @@ +// Copyright 2015 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +CANVAS_DIMENSIONS, 32, +MOVE_TO, 4.8f, 5, +CUBIC_TO, 3.26f, 5, 2.01f, 6.29f, 2.01f, 7.88f, +LINE_TO, 2, 25.13f, +CUBIC_TO, 2, 26.71f, 3.26f, 28, 4.8f, 28, +LINE_TO, 27.2f, 28, +CUBIC_TO, 28.74f, 28, 30, 26.71f, 30, 25.13f, +LINE_TO, 30, 10.75f, +CUBIC_TO, 30, 9.17f, 28.54f, 8, 27, 8, +LINE_TO, 16, 8, +LINE_TO, 13.2f, 5, +LINE_TO, 4.8f, 5, +CLOSE, +MOVE_TO, 7, 11, +LINE_TO, 7, 25, +LINE_TO, 25, 25, +LINE_TO, 25, 15, +LINE_TO, 17, 15, +LINE_TO, 17, 11, +LINE_TO, 7, 11, +CLOSE, +MOVE_TO, 11, 23, +LINE_TO, 9, 23, +LINE_TO, 9, 21, +LINE_TO, 11, 21, +LINE_TO, 11, 23, +CLOSE, +MOVE_TO, 11, 19, +LINE_TO, 9, 19, +LINE_TO, 9, 17, +LINE_TO, 11, 17, +LINE_TO, 11, 19, +CLOSE, +MOVE_TO, 11, 15, +LINE_TO, 9, 15, +LINE_TO, 9, 13, +LINE_TO, 11, 13, +LINE_TO, 11, 15, +CLOSE, +MOVE_TO, 15, 23, +LINE_TO, 13, 23, +LINE_TO, 13, 21, +LINE_TO, 15, 21, +LINE_TO, 15, 23, +CLOSE, +MOVE_TO, 15, 19, +LINE_TO, 13, 19, +LINE_TO, 13, 17, +LINE_TO, 15, 17, +LINE_TO, 15, 19, +CLOSE, +MOVE_TO, 15, 15, +LINE_TO, 13, 15, +LINE_TO, 13, 13, +LINE_TO, 15, 13, +LINE_TO, 15, 15, +CLOSE, +MOVE_TO, 23, 25, +LINE_TO, 23, 23, +LINE_TO, 17, 23, +LINE_TO, 17, 21, +LINE_TO, 19, 21, +LINE_TO, 19, 19, +LINE_TO, 17, 19, +LINE_TO, 17, 17, +LINE_TO, 23, 17, +LINE_TO, 23, 25, +LINE_TO, 17, 25, +LINE_TO, 23, 25, +CLOSE, +MOVE_TO, 21, 19, +LINE_TO, 21, 21, +LINE_TO, 23, 21, +LINE_TO, 23, 19, +LINE_TO, 21, 19, +CLOSE + +CANVAS_DIMENSIONS, 16, +MOVE_TO, 2.5f, 2, +CUBIC_TO, 1.73f, 2, 1.01f, 3.15f, 1.01f, 3.94f, +LINE_TO, 1, 12.56f, +CUBIC_TO, 1, 13.35f, 1.63f, 14, 2.4f, 14, +LINE_TO, 13.6f, 14, +CUBIC_TO, 14.37f, 14, 15, 13.35f, 15, 12.56f, +LINE_TO, 15, 5.38f, +CUBIC_TO, 15, 4.58f, 14.27f, 4, 13.5f, 4, +LINE_TO, 9, 4, +LINE_TO, 7, 2, +LINE_TO, 2.5f, 2, +CLOSE, +MOVE_TO, 3, 5, +LINE_TO, 3, 12, +LINE_TO, 13, 12, +LINE_TO, 13, 7, +LINE_TO, 8, 7, +LINE_TO, 8, 5, +LINE_TO, 3, 5, +CLOSE, +MOVE_TO, 5, 11, +LINE_TO, 4, 11, +LINE_TO, 4, 10, +LINE_TO, 5, 10, +LINE_TO, 5, 11, +CLOSE, +MOVE_TO, 5, 9, +LINE_TO, 4, 9, +LINE_TO, 4, 8, +LINE_TO, 5, 8, +LINE_TO, 5, 9, +CLOSE, +MOVE_TO, 5, 7, +LINE_TO, 4, 7, +LINE_TO, 4, 6, +LINE_TO, 5, 6, +LINE_TO, 5, 7, +CLOSE, +MOVE_TO, 7, 11, +LINE_TO, 6, 11, +LINE_TO, 6, 10, +LINE_TO, 7, 10, +LINE_TO, 7, 11, +CLOSE, +MOVE_TO, 7, 9, +LINE_TO, 6, 9, +LINE_TO, 6, 8, +LINE_TO, 7, 8, +LINE_TO, 7, 9, +CLOSE, +MOVE_TO, 7, 7, +LINE_TO, 6, 7, +LINE_TO, 6, 6, +LINE_TO, 7, 6, +LINE_TO, 7, 7, +CLOSE, +MOVE_TO, 12, 11, +LINE_TO, 8, 11, +LINE_TO, 8, 10, +LINE_TO, 9, 10, +LINE_TO, 9, 9, +LINE_TO, 8, 9, +LINE_TO, 8, 8, +LINE_TO, 12, 8, +LINE_TO, 12, 11, +CLOSE, +MOVE_TO, 10, 9, +LINE_TO, 10, 10, +LINE_TO, 11, 10, +LINE_TO, 11, 9, +LINE_TO, 10, 9, +CLOSE diff --git a/src/components/vector_icons/thorium/restore_tab.bak b/src/components/vector_icons/thorium/restore_tab.bak new file mode 100644 index 00000000..311563af --- /dev/null +++ b/src/components/vector_icons/thorium/restore_tab.bak @@ -0,0 +1,36 @@ +// Copyright 2024 The Chromium Authors and Alex313031 +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +CANVAS_DIMENSIONS, 20, +PATH_COLOR_ARGB, 0xFF, 0x1A, 0x73, 0xE8, +FILL_RULE_NONZERO, +MOVE_TO, 10, 17, +R_CUBIC_TO, -1.94f, 0, -3.6f, -0.68f, -4.96f, -2.04f, +CUBIC_TO, 3.68f, 13.6f, 3, 11.95f, 3, 10, +R_H_LINE_TO, 1.5f, +R_CUBIC_TO, 0, 1.52f, 0.54f, 2.81f, 1.61f, 3.89f, +CUBIC_TO, 7.19f, 14.96f, 8.48f, 15.5f, 10, 15.5f, +R_CUBIC_TO, 1.52f, 0, 2.81f, -0.54f, 3.89f, -1.61f, +CUBIC_TO, 14.96f, 12.81f, 15.5f, 11.52f, 15.5f, 10, +R_CUBIC_TO, 0, -1.52f, -0.54f, -2.81f, -1.61f, -3.89f, +CUBIC_TO, 12.81f, 5.04f, 11.52f, 4.5f, 10, 4.5f, +R_CUBIC_TO, -0.86f, 0, -1.66f, 0.18f, -2.39f, 0.54f, +ARC_TO, 5.33f, 5.33f, 0, 0, 0, 5.77f, 6.5f, +H_LINE_TO, 8, +V_LINE_TO, 8, +H_LINE_TO, 3, +V_LINE_TO, 3, +R_H_LINE_TO, 1.5f, +R_V_LINE_TO, 2.71f, +ARC_TO, 6.94f, 6.94f, 0, 0, 1, 6.89f, 3.73f, +CUBIC_TO, 7.84f, 3.24f, 8.88f, 3, 10, 3, +R_CUBIC_TO, 0.97f, 0, 1.88f, 0.18f, 2.73f, 0.56f, +R_CUBIC_TO, 0.85f, 0.37f, 1.59f, 0.87f, 2.22f, 1.5f, +R_ARC_TO, 7.05f, 7.05f, 0, 0, 1, 1.5f, 2.22f, +R_CUBIC_TO, 0.37f, 0.85f, 0.56f, 1.76f, 0.56f, 2.73f, +R_CUBIC_TO, 0, 0.97f, -0.18f, 1.88f, -0.56f, 2.73f, +R_ARC_TO, 7.05f, 7.05f, 0, 0, 1, -1.5f, 2.22f, +R_ARC_TO, 7.05f, 7.05f, 0, 0, 1, -2.22f, 1.5f, +ARC_TO, 6.73f, 6.73f, 0, 0, 1, 10, 17, +CLOSE diff --git a/src/components/vector_icons/thorium/restore_tab.icon b/src/components/vector_icons/thorium/restore_tab.icon index 311563af..e923c084 100644 --- a/src/components/vector_icons/thorium/restore_tab.icon +++ b/src/components/vector_icons/thorium/restore_tab.icon @@ -1,36 +1,25 @@ -// Copyright 2024 The Chromium Authors and Alex313031 -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2024 The Brave Authors and Alex313031 +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at http://mozilla.org/MPL/2.0/. -CANVAS_DIMENSIONS, 20, +CANVAS_DIMENSIONS, 24, PATH_COLOR_ARGB, 0xFF, 0x1A, 0x73, 0xE8, -FILL_RULE_NONZERO, -MOVE_TO, 10, 17, -R_CUBIC_TO, -1.94f, 0, -3.6f, -0.68f, -4.96f, -2.04f, -CUBIC_TO, 3.68f, 13.6f, 3, 11.95f, 3, 10, -R_H_LINE_TO, 1.5f, -R_CUBIC_TO, 0, 1.52f, 0.54f, 2.81f, 1.61f, 3.89f, -CUBIC_TO, 7.19f, 14.96f, 8.48f, 15.5f, 10, 15.5f, -R_CUBIC_TO, 1.52f, 0, 2.81f, -0.54f, 3.89f, -1.61f, -CUBIC_TO, 14.96f, 12.81f, 15.5f, 11.52f, 15.5f, 10, -R_CUBIC_TO, 0, -1.52f, -0.54f, -2.81f, -1.61f, -3.89f, -CUBIC_TO, 12.81f, 5.04f, 11.52f, 4.5f, 10, 4.5f, -R_CUBIC_TO, -0.86f, 0, -1.66f, 0.18f, -2.39f, 0.54f, -ARC_TO, 5.33f, 5.33f, 0, 0, 0, 5.77f, 6.5f, -H_LINE_TO, 8, -V_LINE_TO, 8, -H_LINE_TO, 3, -V_LINE_TO, 3, -R_H_LINE_TO, 1.5f, -R_V_LINE_TO, 2.71f, -ARC_TO, 6.94f, 6.94f, 0, 0, 1, 6.89f, 3.73f, -CUBIC_TO, 7.84f, 3.24f, 8.88f, 3, 10, 3, -R_CUBIC_TO, 0.97f, 0, 1.88f, 0.18f, 2.73f, 0.56f, -R_CUBIC_TO, 0.85f, 0.37f, 1.59f, 0.87f, 2.22f, 1.5f, -R_ARC_TO, 7.05f, 7.05f, 0, 0, 1, 1.5f, 2.22f, -R_CUBIC_TO, 0.37f, 0.85f, 0.56f, 1.76f, 0.56f, 2.73f, -R_CUBIC_TO, 0, 0.97f, -0.18f, 1.88f, -0.56f, 2.73f, -R_ARC_TO, 7.05f, 7.05f, 0, 0, 1, -1.5f, 2.22f, -R_ARC_TO, 7.05f, 7.05f, 0, 0, 1, -2.22f, 1.5f, -ARC_TO, 6.73f, 6.73f, 0, 0, 1, 10, 17, +MOVE_TO, 17.27f, 18.96f, +R_ARC_TO, 0.83f, 0.83f, 0, 1, 1, -0.94f, -1.38f, +R_CUBIC_TO, 2.03f, -1.38f, 3.34f, -3.9f, 3.34f, -6.41f, +R_CUBIC_TO, 0, -4.14f, -3.36f, -7.5f, -7.5f, -7.5f, +R_CUBIC_TO, -4.14f, 0, -7.5f, 3.37f, -7.5f, 7.5f, +R_CUBIC_TO, 0, 3.97f, 3.1f, 7.22f, 7, 7.48f, +R_LINE_TO, -1.18f, -2.07f, +R_ARC_TO, 0.83f, 0.83f, 0, 0, 1, 1.45f, -0.83f, +R_LINE_TO, 1.79f, 3.14f, +R_ARC_TO, 0.83f, 0.83f, 0, 0, 1, -0.32f, 1.14f, +R_LINE_TO, -3.33f, 1.87f, +R_ARC_TO, 0.84f, 0.84f, 0, 0, 1, -0.81f, -1.45f, +R_LINE_TO, 0.69f, -0.38f, +CUBIC_TO, 5.96f, 19.06f, 3, 15.46f, 3, 11.17f, +CUBIC_TO, 3, 6.11f, 7.11f, 2, 12.17f, 2, +R_CUBIC_TO, 5.05f, 0, 9.17f, 4.11f, 9.17f, 9.17f, +R_CUBIC_TO, 0, 3.05f, -1.6f, 6.1f, -4.07f, 7.79f, CLOSE diff --git a/win_args.gn b/win_args.gn index d5933a84..08938c33 100644 --- a/win_args.gn +++ b/win_args.gn @@ -85,4 +85,4 @@ use_thin_lto = true thin_lto_enable_optimizations = true enable_rust = true chrome_pgo_phase = 2 -pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-6723-1732295315-4ad8ea43591155058b0ae154377eb7ba9f82d617-74da9411216ab49f72b5ea57c6e907e5cf436f73.profdata" +pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-6723-1732380281-69c4b8e7155e0c5c5cc3228c3a832212136cdd7c-1d82f3f10d1e206a7d99e1b5122a997bec34666a.profdata"