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

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

Issue 147973002: Move SetJavaScriptFlags() from webkit to content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/worker/DEPS ('k') | webkit/glue/webkit_glue.h » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/worker/worker_thread.h" 5 #include "content/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/threading/thread_local.h" 9 #include "base/threading/thread_local.h"
10 #include "content/child/appcache/appcache_dispatcher.h" 10 #include "content/child/appcache/appcache_dispatcher.h"
11 #include "content/child/appcache/appcache_frontend_impl.h" 11 #include "content/child/appcache/appcache_frontend_impl.h"
12 #include "content/child/db_message_filter.h" 12 #include "content/child/db_message_filter.h"
13 #include "content/child/indexed_db/indexed_db_message_filter.h" 13 #include "content/child/indexed_db/indexed_db_message_filter.h"
14 #include "content/child/runtime_features.h" 14 #include "content/child/runtime_features.h"
15 #include "content/child/web_database_observer_impl.h" 15 #include "content/child/web_database_observer_impl.h"
16 #include "content/common/child_process_messages.h" 16 #include "content/common/child_process_messages.h"
17 #include "content/common/worker_messages.h" 17 #include "content/common/worker_messages.h"
18 #include "content/public/common/content_switches.h" 18 #include "content/public/common/content_switches.h"
19 #include "content/worker/websharedworker_stub.h" 19 #include "content/worker/websharedworker_stub.h"
20 #include "content/worker/worker_webkitplatformsupport_impl.h" 20 #include "content/worker/worker_webkitplatformsupport_impl.h"
21 #include "ipc/ipc_sync_channel.h" 21 #include "ipc/ipc_sync_channel.h"
22 #include "third_party/WebKit/public/platform/WebBlobRegistry.h" 22 #include "third_party/WebKit/public/platform/WebBlobRegistry.h"
23 #include "third_party/WebKit/public/web/WebDatabase.h" 23 #include "third_party/WebKit/public/web/WebDatabase.h"
24 #include "third_party/WebKit/public/web/WebKit.h" 24 #include "third_party/WebKit/public/web/WebKit.h"
25 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" 25 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
26 #include "webkit/glue/webkit_glue.h" 26 #include "v8/include/v8.h"
27 27
28 using blink::WebRuntimeFeatures; 28 using blink::WebRuntimeFeatures;
29 29
30 namespace content { 30 namespace content {
31 31
32 static base::LazyInstance<base::ThreadLocalPointer<WorkerThread> > lazy_tls = 32 static base::LazyInstance<base::ThreadLocalPointer<WorkerThread> > lazy_tls =
33 LAZY_INSTANCE_INITIALIZER; 33 LAZY_INSTANCE_INITIALIZER;
34 34
35 WorkerThread::WorkerThread() { 35 WorkerThread::WorkerThread() {
36 lazy_tls.Pointer()->Set(this); 36 lazy_tls.Pointer()->Set(this);
37 webkit_platform_support_.reset(new WorkerWebKitPlatformSupportImpl( 37 webkit_platform_support_.reset(new WorkerWebKitPlatformSupportImpl(
38 thread_safe_sender(), 38 thread_safe_sender(),
39 sync_message_filter(), 39 sync_message_filter(),
40 quota_message_filter())); 40 quota_message_filter()));
41 41
42 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 42 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
43 if (command_line.HasSwitch(switches::kJavaScriptFlags)) { 43 if (command_line.HasSwitch(switches::kJavaScriptFlags)) {
44 webkit_glue::SetJavaScriptFlags( 44 std::string flags(
45 command_line.GetSwitchValueASCII(switches::kJavaScriptFlags)); 45 command_line.GetSwitchValueASCII(switches::kJavaScriptFlags));
46 v8::V8::SetFlagsFromString(flags.c_str(), static_cast<int>(flags.size()));
46 } 47 }
47 SetRuntimeFeaturesDefaultsAndUpdateFromArgs(command_line); 48 SetRuntimeFeaturesDefaultsAndUpdateFromArgs(command_line);
48 49
49 blink::initialize(webkit_platform_support_.get()); 50 blink::initialize(webkit_platform_support_.get());
50 51
51 appcache_dispatcher_.reset( 52 appcache_dispatcher_.reset(
52 new AppCacheDispatcher(this, new AppCacheFrontendImpl())); 53 new AppCacheDispatcher(this, new AppCacheFrontendImpl()));
53 54
54 db_message_filter_ = new DBMessageFilter(); 55 db_message_filter_ = new DBMessageFilter();
55 channel()->AddFilter(db_message_filter_.get()); 56 channel()->AddFilter(db_message_filter_.get());
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 143
143 void WorkerThread::RemoveWorkerStub(WebSharedWorkerStub* stub) { 144 void WorkerThread::RemoveWorkerStub(WebSharedWorkerStub* stub) {
144 worker_stubs_.erase(stub); 145 worker_stubs_.erase(stub);
145 } 146 }
146 147
147 void WorkerThread::AddWorkerStub(WebSharedWorkerStub* stub) { 148 void WorkerThread::AddWorkerStub(WebSharedWorkerStub* stub) {
148 worker_stubs_.insert(stub); 149 worker_stubs_.insert(stub);
149 } 150 }
150 151
151 } // namespace content 152 } // namespace content
OLDNEW
« no previous file with comments | « content/worker/DEPS ('k') | webkit/glue/webkit_glue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698