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

Unified Diff: components/nacl/renderer/ppb_nacl_private_impl.cc

Issue 264923011: Add a whitelist check for nacl-nonsfi mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: feedback, add a test Created 6 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
Index: components/nacl/renderer/ppb_nacl_private_impl.cc
diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc
index a4020d98a2107166603d2ff9f0f9e684db40a14e..7ee3c779c6f1b1a50fa1f44f4b63c8769dc81afd 100644
--- a/components/nacl/renderer/ppb_nacl_private_impl.cc
+++ b/components/nacl/renderer/ppb_nacl_private_impl.cc
@@ -501,7 +501,13 @@ int32_t GetNumberOfProcessors() {
}
PP_Bool IsNonSFIModeEnabled() {
-#if defined(OS_LINUX)
+ // Note that this only indicates whether non-sfi mode *can* run for a given
+ // platform and if nonsfi manifest entries are preferred. There can be other
+ // restrictions which prevent a particular module from launching. See
+ // NaClProcessHost::Launch which makes the final determination.
+#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
Mark Seaborn 2014/05/08 01:06:02 Same comment as in other file
elijahtaylor1 2014/05/08 20:00:24 Done.
+ return PP_TRUE;
+#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
Mark Seaborn 2014/05/08 01:06:02 Same here too
elijahtaylor1 2014/05/08 20:00:24 Done.
return PP_FromBool(CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableNaClNonSfiMode));
#else

Powered by Google App Engine
This is Rietveld 408576698