mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-03-04 03:47:41 +01:00
a584bd187b
- Mac: Xcode 12.2 and the MacOS 11.0 SDK are now required for building. - MacOS 10.10 (Yosemite) is no longer supported (see https://crbug.com/1126056). - Flash is no longer supported (see https://www.chromium.org/flash-roadmap).
49 lines
2.5 KiB
Diff
49 lines
2.5 KiB
Diff
diff --git content/browser/child_process_launcher_helper_linux.cc content/browser/child_process_launcher_helper_linux.cc
|
|
index f3d40b628ec2..7efc41048b3c 100644
|
|
--- content/browser/child_process_launcher_helper_linux.cc
|
|
+++ content/browser/child_process_launcher_helper_linux.cc
|
|
@@ -162,7 +162,7 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread(
|
|
base::File OpenFileToShare(const base::FilePath& path,
|
|
base::MemoryMappedFile::Region* region) {
|
|
base::FilePath exe_dir;
|
|
- bool result = base::PathService::Get(base::BasePathKey::DIR_EXE, &exe_dir);
|
|
+ bool result = base::PathService::Get(base::BasePathKey::DIR_ASSETS, &exe_dir);
|
|
DCHECK(result);
|
|
base::File file(exe_dir.Append(path),
|
|
base::File::FLAG_OPEN | base::File::FLAG_READ);
|
|
diff --git sandbox/linux/suid/client/setuid_sandbox_host.cc sandbox/linux/suid/client/setuid_sandbox_host.cc
|
|
index 0aaed76c1dda..517c3d8b5772 100644
|
|
--- sandbox/linux/suid/client/setuid_sandbox_host.cc
|
|
+++ sandbox/linux/suid/client/setuid_sandbox_host.cc
|
|
@@ -120,7 +120,7 @@ bool SetuidSandboxHost::IsDisabledViaEnvironment() {
|
|
base::FilePath SetuidSandboxHost::GetSandboxBinaryPath() {
|
|
base::FilePath sandbox_binary;
|
|
base::FilePath exe_dir;
|
|
- if (base::PathService::Get(base::DIR_EXE, &exe_dir)) {
|
|
+ if (base::PathService::Get(base::DIR_ASSETS, &exe_dir)) {
|
|
base::FilePath sandbox_candidate = exe_dir.AppendASCII("chrome-sandbox");
|
|
if (base::PathExists(sandbox_candidate))
|
|
sandbox_binary = sandbox_candidate;
|
|
diff --git ui/gl/init/gl_initializer_linux_x11.cc ui/gl/init/gl_initializer_linux_x11.cc
|
|
index a5c030d5f3d3..a5a8c68d98c1 100644
|
|
--- ui/gl/init/gl_initializer_linux_x11.cc
|
|
+++ ui/gl/init/gl_initializer_linux_x11.cc
|
|
@@ -86,7 +86,7 @@ bool InitializeStaticEGLInternal(GLImplementation implementation) {
|
|
if (implementation == kGLImplementationSwiftShaderGL) {
|
|
#if BUILDFLAG(ENABLE_SWIFTSHADER)
|
|
base::FilePath module_path;
|
|
- if (!base::PathService::Get(base::DIR_MODULE, &module_path))
|
|
+ if (!base::PathService::Get(base::DIR_ASSETS, &module_path))
|
|
return false;
|
|
module_path = module_path.Append("swiftshader/");
|
|
|
|
@@ -97,7 +97,7 @@ bool InitializeStaticEGLInternal(GLImplementation implementation) {
|
|
#endif
|
|
} else if (implementation == kGLImplementationEGLANGLE) {
|
|
base::FilePath module_path;
|
|
- if (!base::PathService::Get(base::DIR_MODULE, &module_path))
|
|
+ if (!base::PathService::Get(base::DIR_ASSETS, &module_path))
|
|
return false;
|
|
|
|
glesv2_path = module_path.Append(kGLESv2ANGLELibraryName);
|