-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
25 changed files
with
160 additions
and
202 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From f47615158243cf16dccad204e2d06e329c83e5c7 Mon Sep 17 00:00:00 2001 | ||
From 89464ac4369150b047c403ed707736c534fe01ba Mon Sep 17 00:00:00 2001 | ||
From: Mario Sanchez Prada <[email protected]> | ||
Date: Wed, 4 Jul 2018 17:02:26 +0100 | ||
Subject: [PATCH 1/4] ffmpeg: Use royalty-free libfdk-aac for AAC playback | ||
|
@@ -1609,10 +1609,10 @@ index 367a7f7f3c..bc43b980d5 100644 | |
+#define FFMPEG_VERSION "4.3.git" | ||
#endif /* AVUTIL_FFVERSION_H */ | ||
diff --git a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py | ||
index 75333a2c9f..ae8cf3a69c 100755 | ||
index b51f47934a..a77646e57e 100755 | ||
--- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py | ||
+++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py | ||
@@ -910,11 +910,27 @@ def ConfigureAndBuild(target_arch, target_os, host_os, host_arch, parallel_jobs, | ||
@@ -912,11 +912,27 @@ def ConfigureAndBuild(target_arch, target_os, host_os, host_arch, parallel_jobs, | ||
'--ar=cygwin-wrapper lib', | ||
]) | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
patches/0002-ffmpeg-Handle-transient-decode-errors-arising-from-l.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 71ba0c7a857c919a5db006b2fcbc0f9d4473a3e6 Mon Sep 17 00:00:00 2001 | ||
From b8554ce16b08329fac4563a8dc02305fddc80ea6 Mon Sep 17 00:00:00 2001 | ||
From: Jan Schmidt <[email protected]> | ||
Date: Wed, 1 May 2019 17:49:42 +0200 | ||
Subject: [PATCH 2/4] ffmpeg: Handle transient decode errors arising from | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 4ffb09f462a0d3bbec4eb239e71718ab18e7424c Mon Sep 17 00:00:00 2001 | ||
From 8eb22b8000b0f54895ec140492dc4d570c0c33eb Mon Sep 17 00:00:00 2001 | ||
From: Andre Moreira Magalhaes <[email protected]> | ||
Date: Thu, 16 Jul 2020 20:22:57 -0300 | ||
Subject: [PATCH 3/4] Use system wide node | ||
|
2 changes: 1 addition & 1 deletion
2
patches/0004-Ensure-libffmpeg.so-is-in-the-rpath-of-binaries.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 9d0f1fa1d670e89245bc24583a92b6ed2e8c20c2 Mon Sep 17 00:00:00 2001 | ||
From 6fa73e046ad88de40bd25bb08cac417e2cf34785 Mon Sep 17 00:00:00 2001 | ||
From: Ryan Gonzalez <[email protected]> | ||
Date: Thu, 1 Oct 2020 16:39:00 -0500 | ||
Subject: [PATCH 4/4] Ensure libffmpeg.so is in the rpath of binaries | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From b81f8bc8d0c50b901d285b2c738316a1fc796865 Mon Sep 17 00:00:00 2001 | ||
From 0e6f907c18e4fc968a71109a86c721fa7be64d15 Mon Sep 17 00:00:00 2001 | ||
From: Ryan Gonzalez <[email protected]> | ||
Date: Tue, 17 Mar 2020 13:18:27 -0500 | ||
Subject: [PATCH 05/24] flatpak: Add initial sandbox support | ||
Subject: [PATCH 05/23] flatpak: Add initial sandbox support | ||
|
||
--- | ||
.gitignore | 1 + | ||
|
@@ -29,22 +29,22 @@ Subject: [PATCH 05/24] flatpak: Add initial sandbox support | |
create mode 100644 sandbox/linux/services/flatpak_sandbox.h | ||
|
||
diff --git a/.gitignore b/.gitignore | ||
index f6164b328aa4a..5e08625dfe664 100644 | ||
index 0d222bbe0b579..ef17dc6e39b92 100644 | ||
--- a/.gitignore | ||
+++ b/.gitignore | ||
@@ -62,6 +62,7 @@ v8.log | ||
vs-chromium-project.txt | ||
@@ -63,6 +63,7 @@ vs-chromium-project.txt | ||
/.clangd | ||
/.clangd/ | ||
/.clangd-index/ | ||
+/.flatpak-builder/ | ||
# Settings directories for eclipse | ||
/.externalToolBuilders/ | ||
/.settings/ | ||
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h | ||
index c0cc548d9f8e5..f987a8331f3b4 100644 | ||
index ce16488c6d3c3..b1d4b70d815f3 100644 | ||
--- a/base/threading/thread_restrictions.h | ||
+++ b/base/threading/thread_restrictions.h | ||
@@ -284,6 +284,10 @@ namespace resource_coordinator { | ||
@@ -286,6 +286,10 @@ namespace resource_coordinator { | ||
class TabManagerDelegate; | ||
} | ||
|
||
|
@@ -55,15 +55,15 @@ index c0cc548d9f8e5..f987a8331f3b4 100644 | |
namespace service_manager { | ||
class ServiceProcessLauncher; | ||
} | ||
@@ -414,6 +418,7 @@ class BASE_EXPORT ScopedAllowBlocking { | ||
@@ -416,6 +420,7 @@ class BASE_EXPORT ScopedAllowBlocking { | ||
friend class printing::PrintJobWorker; | ||
friend class remoting::ScopedBypassIOThreadRestrictions; // crbug.com/1144161 | ||
friend class resource_coordinator::TabManagerDelegate; // crbug.com/778703 | ||
+ friend class sandbox::FlatpakSandbox; | ||
friend class web::WebSubThread; | ||
friend class weblayer::BrowserContextImpl; | ||
friend class weblayer::ContentBrowserClientImpl; | ||
@@ -486,6 +491,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives { | ||
@@ -489,6 +494,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives { | ||
friend class rlz_lib::FinancialPing; | ||
friend class shell_integration_linux:: | ||
LaunchXdgUtilityScopedAllowBaseSyncPrimitives; | ||
|
@@ -378,10 +378,10 @@ index 82923d4a85df3..cf4765841786a 100644 | |
base::GlobalDescriptors::Descriptor( | ||
static_cast<uint32_t>(kSandboxIPCChannel), GetSandboxFD())); | ||
diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn | ||
index e9a94b46125e3..770ce3b6edfea 100644 | ||
index 2f778dd0bcab2..25e9571232351 100644 | ||
--- a/sandbox/linux/BUILD.gn | ||
+++ b/sandbox/linux/BUILD.gn | ||
@@ -329,6 +329,10 @@ if (is_linux || is_chromeos) { | ||
@@ -333,6 +333,10 @@ if (is_linux || is_chromeos) { | ||
|
||
component("sandbox_services") { | ||
sources = [ | ||
|
@@ -392,7 +392,7 @@ index e9a94b46125e3..770ce3b6edfea 100644 | |
"services/init_process_reaper.cc", | ||
"services/init_process_reaper.h", | ||
"services/proc_util.cc", | ||
@@ -367,7 +371,10 @@ component("sandbox_services") { | ||
@@ -371,7 +375,10 @@ component("sandbox_services") { | ||
|
||
defines = [ "SANDBOX_IMPLEMENTATION" ] | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From c7421a7caf08140059c50b071257405159acb3e4 Mon Sep 17 00:00:00 2001 | ||
From 800b4a9f516604313318a0529d49c0a1b04d322d Mon Sep 17 00:00:00 2001 | ||
From: Ryan Gonzalez <[email protected]> | ||
Date: Tue, 17 Nov 2020 13:00:39 -0600 | ||
Subject: [PATCH 06/24] flatpak: Expose Widevine into the sandbox | ||
Subject: [PATCH 06/23] flatpak: Expose Widevine into the sandbox | ||
|
||
--- | ||
.../zygote_host/zygote_host_impl_linux.cc | 54 +++++++++++++- | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,18 @@ | ||
From d8033a1ec89dfe9d8a1804a4dea82f31e0082a8a Mon Sep 17 00:00:00 2001 | ||
From 096a69c3b33b58e884a41ceac0a0d6cbb19d08f5 Mon Sep 17 00:00:00 2001 | ||
From: Ryan Gonzalez <[email protected]> | ||
Date: Tue, 25 Aug 2020 19:26:07 -0500 | ||
Subject: [PATCH 07/24] flatpak: Adjust paths for the sandbox | ||
Subject: [PATCH 07/23] flatpak: Adjust paths for the sandbox | ||
|
||
--- | ||
chrome/common/BUILD.gn | 4 +++ | ||
chrome/common/chrome_paths.cc | 52 +++++++++++++++++++++++++---------- | ||
2 files changed, 42 insertions(+), 14 deletions(-) | ||
|
||
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn | ||
index 737d5ea55058d..b208c819e1001 100644 | ||
index a99755c47d431..5a558ba7897df 100644 | ||
--- a/chrome/common/BUILD.gn | ||
+++ b/chrome/common/BUILD.gn | ||
@@ -649,6 +649,10 @@ static_library("constants") { | ||
@@ -646,6 +646,10 @@ static_library("constants") { | ||
"//third_party/widevine/cdm:headers", | ||
] | ||
} | ||
|
@@ -24,7 +24,7 @@ index 737d5ea55058d..b208c819e1001 100644 | |
|
||
# Use a static library here because many test binaries depend on this but don't | ||
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc | ||
index fef80b760915b..7b86e93f9708d 100644 | ||
index 34b525ff22356..dd679af8d27d8 100644 | ||
--- a/chrome/common/chrome_paths.cc | ||
+++ b/chrome/common/chrome_paths.cc | ||
@@ -4,6 +4,7 @@ | ||
|
@@ -46,7 +46,7 @@ index fef80b760915b..7b86e93f9708d 100644 | |
#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && BUILDFLAG(ENABLE_WIDEVINE) | ||
#include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck | ||
#endif | ||
@@ -197,8 +202,8 @@ bool PathProvider(int key, base::FilePath* result) { | ||
@@ -189,8 +194,8 @@ bool PathProvider(int key, base::FilePath* result) { | ||
#else | ||
if (!GetUserDownloadsDirectory(&cur)) | ||
return false; | ||
|
@@ -57,7 +57,7 @@ index fef80b760915b..7b86e93f9708d 100644 | |
#endif | ||
break; | ||
case chrome::DIR_CRASH_DUMPS: | ||
@@ -371,7 +376,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
@@ -349,7 +354,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
#if defined(OS_MAC) | ||
cur = base::mac::FrameworkBundlePath(); | ||
cur = cur.Append(FILE_PATH_LITERAL("Resources")) | ||
|
@@ -66,7 +66,7 @@ index fef80b760915b..7b86e93f9708d 100644 | |
break; | ||
#elif defined(OS_ANDROID) | ||
if (!base::PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &cur)) | ||
@@ -445,6 +450,14 @@ bool PathProvider(int key, base::FilePath* result) { | ||
@@ -423,6 +428,14 @@ bool PathProvider(int key, base::FilePath* result) { | ||
break; | ||
#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_OPENBSD) | ||
case chrome::DIR_POLICY_FILES: { | ||
|
@@ -81,7 +81,7 @@ index fef80b760915b..7b86e93f9708d 100644 | |
#if BUILDFLAG(GOOGLE_CHROME_BRANDING) | ||
cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); | ||
#else | ||
@@ -468,7 +481,13 @@ bool PathProvider(int key, base::FilePath* result) { | ||
@@ -446,7 +459,13 @@ bool PathProvider(int key, base::FilePath* result) { | ||
#endif | ||
#if defined(OS_LINUX) || defined(OS_CHROMEOS) | ||
case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { | ||
|
@@ -96,7 +96,7 @@ index fef80b760915b..7b86e93f9708d 100644 | |
break; | ||
} | ||
#endif | ||
@@ -478,8 +497,8 @@ bool PathProvider(int key, base::FilePath* result) { | ||
@@ -456,8 +475,8 @@ bool PathProvider(int key, base::FilePath* result) { | ||
return false; | ||
|
||
cur = cur.Append(FILE_PATH_LITERAL("Google")) | ||
|
@@ -107,7 +107,7 @@ index fef80b760915b..7b86e93f9708d 100644 | |
create_dir = false; | ||
#else | ||
if (!base::PathService::Get(base::DIR_MODULE, &cur)) | ||
@@ -505,19 +524,25 @@ bool PathProvider(int key, base::FilePath* result) { | ||
@@ -483,19 +502,25 @@ bool PathProvider(int key, base::FilePath* result) { | ||
case chrome::DIR_NATIVE_MESSAGING: | ||
#if defined(OS_MAC) | ||
#if BUILDFLAG(GOOGLE_CHROME_BRANDING) | ||
|
@@ -139,7 +139,7 @@ index fef80b760915b..7b86e93f9708d 100644 | |
#endif | ||
#endif // !defined(OS_MAC) | ||
break; | ||
@@ -567,8 +592,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
@@ -536,8 +561,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
|
||
// TODO(bauerb): http://crbug.com/259796 | ||
base::ThreadRestrictions::ScopedAllowIO allow_io; | ||
|
4 changes: 2 additions & 2 deletions
4
patches/0008-Import-chromium-71.0.3578.98-widevine-r3.patch.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From 9f99dee0801b83308f4d96203c2df76647b4f56f Mon Sep 17 00:00:00 2001 | ||
From 4a9d5722ad04117d8ae4b03f3988a1dbf0506eaf Mon Sep 17 00:00:00 2001 | ||
From: Ryan Gonzalez <[email protected]> | ||
Date: Tue, 17 Nov 2020 22:57:29 -0600 | ||
Subject: [PATCH 08/24] Import chromium-71.0.3578.98-widevine-r3.patch | ||
Subject: [PATCH 08/23] Import chromium-71.0.3578.98-widevine-r3.patch | ||
|
||
Taken from the Fedora 33 repositories. | ||
--- | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From d43cdbc2e17a25b4b869d1ba4bbaaeaf3bd5099e Mon Sep 17 00:00:00 2001 | ||
From 7226d2bcde8926af9774e016ae0a0f2b71ff34ef Mon Sep 17 00:00:00 2001 | ||
From: Ryan Gonzalez <[email protected]> | ||
Date: Wed, 26 Aug 2020 20:30:35 -0500 | ||
Subject: [PATCH 09/24] Enable Chromecast by default | ||
Subject: [PATCH 09/23] Enable Chromecast by default | ||
|
||
--- | ||
extensions/common/feature_switch.cc | 14 ++++---------- | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From 605a0e6d60d796edbc369864511438717cbd249d Mon Sep 17 00:00:00 2001 | ||
From 4e70cfff710ba8ae22701e3c9b17d766b55c4022 Mon Sep 17 00:00:00 2001 | ||
From: Daniel Drake <[email protected]> | ||
Date: Fri, 3 Jul 2015 14:59:24 -0600 | ||
Subject: [PATCH 10/24] x11: Set _NET_WM_BYPASS_COMPOSITOR for fullscreen | ||
Subject: [PATCH 10/23] x11: Set _NET_WM_BYPASS_COMPOSITOR for fullscreen | ||
|
||
This improves performance at full screen. | ||
--- | ||
|
@@ -11,7 +11,7 @@ This improves performance at full screen. | |
3 files changed, 9 insertions(+) | ||
|
||
diff --git a/ui/base/x/x11_window.cc b/ui/base/x/x11_window.cc | ||
index 7fbc130d78df7..bacf2c8bcd1c2 100644 | ||
index 585a09a2b6d89..688649c50754f 100644 | ||
--- a/ui/base/x/x11_window.cc | ||
+++ b/ui/base/x/x11_window.cc | ||
@@ -535,6 +535,12 @@ void XWindow::SetFullscreen(bool fullscreen) { | ||
|
@@ -28,7 +28,7 @@ index 7fbc130d78df7..bacf2c8bcd1c2 100644 | |
if (!IsXWindowVisible() || !activatable_) | ||
return; | ||
diff --git a/ui/base/x/x11_window.h b/ui/base/x/x11_window.h | ||
index efed967b24ddf..d1f8d3b9123f6 100644 | ||
index 0a870d41a0425..bac3e48bfa88b 100644 | ||
--- a/ui/base/x/x11_window.h | ||
+++ b/ui/base/x/x11_window.h | ||
@@ -110,6 +110,7 @@ class COMPONENT_EXPORT(UI_BASE_X) XWindow { | ||
|
@@ -40,7 +40,7 @@ index efed967b24ddf..d1f8d3b9123f6 100644 | |
void Deactivate(); | ||
bool IsActive() const; | ||
diff --git a/ui/platform_window/x11/x11_window.cc b/ui/platform_window/x11/x11_window.cc | ||
index 0cfcb1cb66e36..b24659aeb99e9 100644 | ||
index 967dd5f1c0999..dd596cf359fc2 100644 | ||
--- a/ui/platform_window/x11/x11_window.cc | ||
+++ b/ui/platform_window/x11/x11_window.cc | ||
@@ -300,6 +300,8 @@ void X11Window::ToggleFullscreen() { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From 3bcbeb527a4e16d628a104c26351c0f37285b20c Mon Sep 17 00:00:00 2001 | ||
From 6cc5e26c2835126981ccdc98113aa9ca8c7c83c3 Mon Sep 17 00:00:00 2001 | ||
From: Mario Sanchez Prada <[email protected]> | ||
Date: Thu, 28 Jan 2016 13:53:08 +0000 | ||
Subject: [PATCH 11/24] memory: Enable the tab discards feature | ||
Subject: [PATCH 11/23] memory: Enable the tab discards feature | ||
|
||
This allows manually discarding tabs from chrome://discards as well | ||
as automatic tab discards once a certain level of "memory pressure" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From 4127d847c04a9eb5c4277b1c108c52fd088e9c30 Mon Sep 17 00:00:00 2001 | ||
From d4dec672f3715a8697090703bef045ce54d58afa Mon Sep 17 00:00:00 2001 | ||
From: Ryan Gonzalez <[email protected]> | ||
Date: Tue, 19 Jan 2021 15:41:16 -0600 | ||
Subject: [PATCH 12/24] Enable accelerated mjpeg decode on Linux | ||
Subject: [PATCH 12/23] Enable accelerated mjpeg decode on Linux | ||
|
||
--- | ||
chrome/browser/about_flags.cc | 6 +++--- | ||
|
@@ -11,10 +11,10 @@ Subject: [PATCH 12/24] Enable accelerated mjpeg decode on Linux | |
4 files changed, 21 insertions(+), 13 deletions(-) | ||
|
||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc | ||
index 1f7e7ced6a98a..9ba75ccc991e5 100644 | ||
index 01dea31dd36b5..9111e2643a9c1 100644 | ||
--- a/chrome/browser/about_flags.cc | ||
+++ b/chrome/browser/about_flags.cc | ||
@@ -3022,7 +3022,7 @@ const FeatureEntry kFeatureEntries[] = { | ||
@@ -3082,7 +3082,7 @@ const FeatureEntry kFeatureEntries[] = { | ||
"disable-accelerated-video-decode", | ||
flag_descriptions::kAcceleratedVideoDecodeName, | ||
flag_descriptions::kAcceleratedVideoDecodeDescription, | ||
|
@@ -23,7 +23,7 @@ index 1f7e7ced6a98a..9ba75ccc991e5 100644 | |
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), | ||
}, | ||
#endif // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && | ||
@@ -3526,10 +3526,10 @@ const FeatureEntry kFeatureEntries[] = { | ||
@@ -3620,10 +3620,10 @@ const FeatureEntry kFeatureEntries[] = { | ||
flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop, | ||
MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)}, | ||
#endif // ENABLE_VR | ||
|
@@ -37,10 +37,10 @@ index 1f7e7ced6a98a..9ba75ccc991e5 100644 | |
#endif // BUILDFLAG(IS_CHROMEOS_ASH) | ||
{"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName, | ||
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc | ||
index 5990170b110ad..1afe76e601684 100644 | ||
index dd2914ad06e92..c7d78a2054f60 100644 | ||
--- a/chrome/browser/flag_descriptions.cc | ||
+++ b/chrome/browser/flag_descriptions.cc | ||
@@ -3693,6 +3693,16 @@ const char kVideoToolboxVp9DecodingDescription[] = | ||
@@ -3807,6 +3807,16 @@ const char kMetalDescription[] = | ||
|
||
#endif | ||
|
||
|
@@ -57,7 +57,7 @@ index 5990170b110ad..1afe76e601684 100644 | |
// Chrome OS ------------------------------------------------------------------- | ||
|
||
#if BUILDFLAG(IS_CHROMEOS_ASH) | ||
@@ -3704,12 +3714,6 @@ const char kAccountManagementFlowsV2Description[] = | ||
@@ -3818,12 +3828,6 @@ const char kAccountManagementFlowsV2Description[] = | ||
"Settings. " | ||
"See go/betterAM"; | ||
|
||
|
@@ -71,10 +71,10 @@ index 5990170b110ad..1afe76e601684 100644 | |
"Allow disabling mouse acceleration"; | ||
const char kAllowDisableMouseAccelerationDescription[] = | ||
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h | ||
index 9ca53437280a4..b022cc15548ee 100644 | ||
index 3479dc665a2f4..c1ed295859a2c 100644 | ||
--- a/chrome/browser/flag_descriptions.h | ||
+++ b/chrome/browser/flag_descriptions.h | ||
@@ -2131,6 +2131,13 @@ extern const char kVideoToolboxVp9DecodingDescription[]; | ||
@@ -2201,6 +2201,13 @@ extern const char kMetalDescription[]; | ||
|
||
#endif // defined(OS_MAC) | ||
|
||
|
@@ -88,7 +88,7 @@ index 9ca53437280a4..b022cc15548ee 100644 | |
// Chrome OS ------------------------------------------------------------------ | ||
|
||
#if BUILDFLAG(IS_CHROMEOS_ASH) | ||
@@ -2138,9 +2145,6 @@ extern const char kVideoToolboxVp9DecodingDescription[]; | ||
@@ -2208,9 +2215,6 @@ extern const char kMetalDescription[]; | ||
extern const char kAccountManagementFlowsV2Name[]; | ||
extern const char kAccountManagementFlowsV2Description[]; | ||
|
||
|
@@ -99,10 +99,10 @@ index 9ca53437280a4..b022cc15548ee 100644 | |
extern const char kAllowDisableMouseAccelerationDescription[]; | ||
|
||
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc | ||
index f8b848e7283b7..e14e4d03bb87f 100644 | ||
index e3d58fd654f16..be8116d9b2fc9 100644 | ||
--- a/media/base/media_switches.cc | ||
+++ b/media/base/media_switches.cc | ||
@@ -861,7 +861,7 @@ bool IsVideoCaptureAcceleratedJpegDecodingEnabled() { | ||
@@ -888,7 +888,7 @@ bool IsVideoCaptureAcceleratedJpegDecodingEnabled() { | ||
switches::kUseFakeMjpegDecodeAccelerator)) { | ||
return true; | ||
} | ||
|
Oops, something went wrong.