(Re-landing http://codereview.chromium.org/5991003)

chrome/worker/worker_thread.cc

 // Copyright (c) 2009 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 "chrome/worker/worker_thread.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/thread_local.h"
 #include "chrome/common/appcache/appcache_dispatcher.h"
@@ skipping 42 matching lines @@
       !command_line.HasSwitch(switches::kDisableDesktopNotifications));
 #endif
 
   WebRuntimeFeatures::enableSockets(
       !command_line.HasSwitch(switches::kDisableWebSockets));
 
   WebRuntimeFeatures::enableFileSystem(
       !command_line.HasSwitch(switches::kDisableFileSystem));
 
   WebRuntimeFeatures::enableWebGL(
+      !command_line.HasSwitch(switches::kDisable3DAPIs) &&
       !command_line.HasSwitch(switches::kDisableExperimentalWebGL));
 }
 
 WorkerThread::~WorkerThread() {
   // Shutdown in reverse of the initialization order.
   channel()->RemoveFilter(db_message_filter_.get());
   db_message_filter_ = NULL;
 
   WebKit::shutdown();
   lazy_tls.Pointer()->Set(NULL);
@@ skipping 37 matching lines @@
   }
 }
 
 void WorkerThread::RemoveWorkerStub(WebWorkerStubBase* stub) {
   worker_stubs_.erase(stub);
 }
 
 void WorkerThread::AddWorkerStub(WebWorkerStubBase* stub) {
   worker_stubs_.insert(stub);
 }