mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-13 18:16:20 +01:00
2f1e782f62
Frame identifiers have changed from int64_t to string type. This is due to https://crbug.com/1502660 which removes access to frame routing IDs in the renderer process. New cross-process frame identifiers are 160-bit values (32-bit child process ID + 128-bit local frame token) and most easily represented as strings. All other frame-related expectations and behaviors remain the same.
40 lines
2.0 KiB
Diff
40 lines
2.0 KiB
Diff
diff --git content/browser/child_process_launcher_helper_linux.cc content/browser/child_process_launcher_helper_linux.cc
|
|
index e21cd3f9c447d..3e366eab65155 100644
|
|
--- content/browser/child_process_launcher_helper_linux.cc
|
|
+++ content/browser/child_process_launcher_helper_linux.cc
|
|
@@ -188,7 +188,7 @@ ZygoteCommunication* ChildProcessLauncherHelper::GetZygoteForLaunch() {
|
|
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 84fd365da0283..88f3adf813eca 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/ozone/common/egl_util.cc ui/ozone/common/egl_util.cc
|
|
index 021bcad8c3084..a37406d408718 100644
|
|
--- ui/ozone/common/egl_util.cc
|
|
+++ ui/ozone/common/egl_util.cc
|
|
@@ -127,7 +127,7 @@ bool LoadDefaultEGLGLES2Bindings(
|
|
if (implementation.gl == gl::kGLImplementationEGLANGLE) {
|
|
base::FilePath module_path;
|
|
#if !BUILDFLAG(IS_FUCHSIA)
|
|
- if (!base::PathService::Get(base::DIR_MODULE, &module_path))
|
|
+ if (!base::PathService::Get(base::DIR_ASSETS, &module_path))
|
|
return false;
|
|
#endif
|
|
|