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

Side by Side Diff: chrome/worker/worker_thread.cc

Issue 6027004: Revert 69753 - Added group policy for disabling all client-side 3D APIs in Ch... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/renderer/render_thread.cc ('k') | webkit/plugins/ppapi/plugin_module.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/worker/worker_thread.h" 5 #include "chrome/worker/worker_thread.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/thread_local.h" 9 #include "base/thread_local.h"
10 #include "chrome/common/appcache/appcache_dispatcher.h" 10 #include "chrome/common/appcache/appcache_dispatcher.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 !command_line.HasSwitch(switches::kDisableDesktopNotifications)); 53 !command_line.HasSwitch(switches::kDisableDesktopNotifications));
54 #endif 54 #endif
55 55
56 WebRuntimeFeatures::enableSockets( 56 WebRuntimeFeatures::enableSockets(
57 !command_line.HasSwitch(switches::kDisableWebSockets)); 57 !command_line.HasSwitch(switches::kDisableWebSockets));
58 58
59 WebRuntimeFeatures::enableFileSystem( 59 WebRuntimeFeatures::enableFileSystem(
60 !command_line.HasSwitch(switches::kDisableFileSystem)); 60 !command_line.HasSwitch(switches::kDisableFileSystem));
61 61
62 WebRuntimeFeatures::enableWebGL( 62 WebRuntimeFeatures::enableWebGL(
63 !command_line.HasSwitch(switches::kDisable3DAPIs) &&
64 !command_line.HasSwitch(switches::kDisableExperimentalWebGL)); 63 !command_line.HasSwitch(switches::kDisableExperimentalWebGL));
65 } 64 }
66 65
67 WorkerThread::~WorkerThread() { 66 WorkerThread::~WorkerThread() {
68 // Shutdown in reverse of the initialization order. 67 // Shutdown in reverse of the initialization order.
69 channel()->RemoveFilter(db_message_filter_.get()); 68 channel()->RemoveFilter(db_message_filter_.get());
70 db_message_filter_ = NULL; 69 db_message_filter_ = NULL;
71 70
72 WebKit::shutdown(); 71 WebKit::shutdown();
73 lazy_tls.Pointer()->Set(NULL); 72 lazy_tls.Pointer()->Set(NULL);
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 } 110 }
112 } 111 }
113 112
114 void WorkerThread::RemoveWorkerStub(WebWorkerStubBase* stub) { 113 void WorkerThread::RemoveWorkerStub(WebWorkerStubBase* stub) {
115 worker_stubs_.erase(stub); 114 worker_stubs_.erase(stub);
116 } 115 }
117 116
118 void WorkerThread::AddWorkerStub(WebWorkerStubBase* stub) { 117 void WorkerThread::AddWorkerStub(WebWorkerStubBase* stub) {
119 worker_stubs_.insert(stub); 118 worker_stubs_.insert(stub);
120 } 119 }
OLDNEW
« no previous file with comments | « chrome/renderer/render_thread.cc ('k') | webkit/plugins/ppapi/plugin_module.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698