Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(70)

Unified Diff: content/common/sandbox_policy.cc

Issue 7104005: Fix Flash sandbox regression from r87093. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/sandbox_policy.cc
===================================================================
--- content/common/sandbox_policy.cc (revision 87336)
+++ content/common/sandbox_policy.cc (working copy)
@@ -396,7 +396,6 @@
!browser_command_line.HasSwitch(switches::kNoSandbox) &&
content::GetContentClient()->SandboxPlugin(cmd_line, policy)) {
in_sandbox = true;
- AddDllEvictionPolicy(policy);
}
if (!in_sandbox) {
@@ -405,7 +404,9 @@
return process;
}
- if (type == ChildProcessInfo::GPU_PROCESS) {
+ if (type == ChildProcessInfo::PLUGIN_PROCESS) {
+ AddDllEvictionPolicy(policy);
+ } else if (type == ChildProcessInfo::GPU_PROCESS) {
if (!AddPolicyForGPU(cmd_line, policy))
return 0;
} else if (type == ChildProcessInfo::PPAPI_PLUGIN_PROCESS) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698