Switch from CommandLine switch to WebPreferences to control Pepper 3D.

content/renderer/pepper/ppb_graphics_3d_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/pepper/ppb_graphics_3d_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 51 matching lines @@
       bound_to_instance_(false),
       commit_pending_(false),
       weak_ptr_factory_(this) {
 }
 
 PPB_Graphics3D_Impl::~PPB_Graphics3D_Impl() {
   DestroyGLES2Impl();
 }
 
 // static
-PP_Bool PPB_Graphics3D_Impl::IsGpuBlacklisted() {
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line)
-    return PP_FromBool(command_line->HasSwitch(switches::kDisablePepper3d));
-  return PP_TRUE;
-}
-
-// static
 PP_Resource PPB_Graphics3D_Impl::Create(PP_Instance instance,
                                         PP_Resource share_context,
                                         const int32_t* attrib_list) {
   PPB_Graphics3D_API* share_api = NULL;
-  if (IsGpuBlacklisted())
-    return 0;
   if (share_context) {
     EnterResourceNoLock<PPB_Graphics3D_API> enter(share_context, true);
     if (enter.failed())
       return 0;
     share_api = enter.object();
   }
   scoped_refptr<PPB_Graphics3D_Impl> graphics_3d(
       new PPB_Graphics3D_Impl(instance));
   if (!graphics_3d->Init(share_api, attrib_list))
     return 0;
   return graphics_3d->GetReference();
 }
 
 // static
 PP_Resource PPB_Graphics3D_Impl::CreateRaw(PP_Instance instance,
                                            PP_Resource share_context,
                                            const int32_t* attrib_list) {
   PPB_Graphics3D_API* share_api = NULL;
-  if (IsGpuBlacklisted())
-    return 0;
   if (share_context) {
     EnterResourceNoLock<PPB_Graphics3D_API> enter(share_context, true);
     if (enter.failed())
       return 0;
     share_api = enter.object();
   }
   scoped_refptr<PPB_Graphics3D_Impl> graphics_3d(
       new PPB_Graphics3D_Impl(instance));
   if (!graphics_3d->InitRaw(share_api, attrib_list))
     return 0;
@@ skipping 120 matching lines @@
                          share_gles2);
 }
 
 bool PPB_Graphics3D_Impl::InitRaw(PPB_Graphics3D_API* share_context,
                                   const int32_t* attrib_list) {
   PepperPluginInstanceImpl* plugin_instance =
       HostGlobals::Get()->GetInstance(pp_instance());
   if (!plugin_instance)
     return false;
 
-  PlatformContext3D* share_platform_context = NULL;
-  if (share_context) {
-    PPB_Graphics3D_Impl* share_graphics =
-        static_cast<PPB_Graphics3D_Impl*>(share_context);
-    share_platform_context = share_graphics->platform_context();
-  }
-
+  const WebPreferences& prefs = static_cast<RenderViewImpl*>(plugin_instance->
+      GetRenderView())->webkit_preferences();
+  // 3D access might be disabled or blacklisted.
+  if (!prefs.pepper_3d_enabled)
+    return false;
   // If accelerated compositing of plugins is disabled, fail to create a 3D
   // context, because it won't be visible. This allows graceful fallback in the
   // modules.
-  const WebPreferences& prefs = static_cast<RenderViewImpl*>(plugin_instance->
-      GetRenderView())->webkit_preferences();
   if (!prefs.accelerated_compositing_for_plugins_enabled)
     return false;
 
   platform_context_.reset(new PlatformContext3D);
   if (!platform_context_)
     return false;
 
+  PlatformContext3D* share_platform_context = NULL;
+  if (share_context) {
+    PPB_Graphics3D_Impl* share_graphics =
+        static_cast<PPB_Graphics3D_Impl*>(share_context);
+    share_platform_context = share_graphics->platform_context();
+  }
+
   if (!platform_context_->Init(attrib_list, share_platform_context))
     return false;
 
   platform_context_->SetContextLostCallback(
       base::Bind(&PPB_Graphics3D_Impl::OnContextLost,
                  weak_ptr_factory_.GetWeakPtr()));
 
   platform_context_->SetOnConsoleMessageCallback(
       base::Bind(&PPB_Graphics3D_Impl::OnConsoleMessage,
                  weak_ptr_factory_.GetWeakPtr()));
@@ skipping 61 matching lines @@
               PPP_GRAPHICS_3D_INTERFACE));
   // We have to check *again* that the instance exists, because it could have
   // been deleted during GetPluginInterface(). Even the PluginModule could be
   // deleted, but in that case, the instance should also be gone, so the
   // GetInstance check covers both cases.
   if (ppp_graphics_3d && HostGlobals::Get()->GetInstance(this_pp_instance))
     ppp_graphics_3d->Graphics3DContextLost(this_pp_instance);
 }
 
 }  // namespace content