mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-31 19:45:27 +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.
19 lines
765 B
Diff
19 lines
765 B
Diff
diff --git sandbox/policy/win/sandbox_win.cc sandbox/policy/win/sandbox_win.cc
|
|
index 714422bd2d088..3aa2e830e6148 100644
|
|
--- sandbox/policy/win/sandbox_win.cc
|
|
+++ sandbox/policy/win/sandbox_win.cc
|
|
@@ -993,6 +993,13 @@ ResultCode SandboxWin::StartSandboxedProcess(
|
|
const base::HandlesToInheritVector& handles_to_inherit,
|
|
SandboxDelegate* delegate,
|
|
base::Process* process) {
|
|
+ // Will be nullptr if SandboxInterfaceInfo was not initialized by the CEF
|
|
+ // client, meaning that the sandbox is implicitly disabled.
|
|
+ if (!g_broker_services) {
|
|
+ return LaunchWithoutSandbox(cmd_line, handles_to_inherit, delegate,
|
|
+ process);
|
|
+ }
|
|
+
|
|
const base::ElapsedTimer timer;
|
|
|
|
// Avoid making a policy if we won't use it.
|