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

Unified Diff: ppapi/shared_impl/ppapi_permissions.cc

Issue 10984094: Hook up PpapiPermissions in more places. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | « ppapi/shared_impl/ppapi_permissions.h ('k') | ppapi/shared_impl/ppapi_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/shared_impl/ppapi_permissions.cc
diff --git a/ppapi/shared_impl/ppapi_permissions.cc b/ppapi/shared_impl/ppapi_permissions.cc
index d92f6ba99488e9f05064598ad3d926fbb646406a..7b83323847b04bb836e69f92092ce9b0de1a0097 100644
--- a/ppapi/shared_impl/ppapi_permissions.cc
+++ b/ppapi/shared_impl/ppapi_permissions.cc
@@ -4,7 +4,9 @@
#include "ppapi/shared_impl/ppapi_permissions.h"
+#include "base/command_line.h"
#include "base/logging.h"
+#include "ppapi/shared_impl/ppapi_switches.h"
namespace ppapi {
@@ -19,10 +21,22 @@ PpapiPermissions::~PpapiPermissions() {
// static
PpapiPermissions PpapiPermissions::AllPermissions() {
- return PpapiPermissions(
- PERMISSION_DEV |
- PERMISSION_PRIVATE |
- PERMISSION_BYPASS_USER_GESTURE);
+ return PpapiPermissions(PERMISSION_ALL_BITS);
+}
+
+// static
+PpapiPermissions PpapiPermissions::GetForCommandLine(uint32 base_perms) {
+ uint32 additional_permissions = 0;
+
+#if !defined(OS_NACL)
+ // Testing permissions. The testing flag implies all permissions since the
+ // test plugin needs to test all interfaces.
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnablePepperTesting))
+ additional_permissions |= ppapi::PERMISSION_ALL_BITS;
+#endif
+
+ return PpapiPermissions(base_perms | additional_permissions);
}
bool PpapiPermissions::HasPermission(Permission perm) const {
@@ -31,6 +45,8 @@ bool PpapiPermissions::HasPermission(Permission perm) const {
// represented in the future so don't want callers making assumptions about
// bits.
uint32 perm_int = static_cast<uint32>(perm);
+ if (!perm_int)
+ return true; // You always have "no permission".
DCHECK((perm_int & (perm_int - 1)) == 0);
return !!(permissions_ & perm_int);
}
« no previous file with comments | « ppapi/shared_impl/ppapi_permissions.h ('k') | ppapi/shared_impl/ppapi_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698