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

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

Issue 11773005: Call new WebKit::setIDBFactory method to initialize Indexed DB support (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 7 years, 11 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/renderer/render_thread_impl.cc ('k') | no next file » | 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/common/appcache/appcache_dispatcher.h" 10 #include "content/common/appcache/appcache_dispatcher.h"
11 #include "content/common/db_message_filter.h" 11 #include "content/common/db_message_filter.h"
12 #include "content/common/indexed_db/indexed_db_message_filter.h" 12 #include "content/common/indexed_db/indexed_db_message_filter.h"
13 #include "content/common/web_database_observer_impl.h" 13 #include "content/common/web_database_observer_impl.h"
14 #include "content/common/worker_messages.h" 14 #include "content/common/worker_messages.h"
15 #include "content/public/common/content_switches.h" 15 #include "content/public/common/content_switches.h"
16 #include "content/worker/websharedworker_stub.h" 16 #include "content/worker/websharedworker_stub.h"
17 #include "content/worker/worker_webkitplatformsupport_impl.h" 17 #include "content/worker/worker_webkitplatformsupport_impl.h"
18 #include "ipc/ipc_sync_channel.h" 18 #include "ipc/ipc_sync_channel.h"
19 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebBlobRegis try.h" 19 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebBlobRegis try.h"
20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" 20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h"
21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h"
21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" 22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" 23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
23 #include "webkit/glue/webkit_glue.h" 24 #include "webkit/glue/webkit_glue.h"
24 25
25 using WebKit::WebRuntimeFeatures; 26 using WebKit::WebRuntimeFeatures;
26 27
27 namespace content { 28 namespace content {
28 29
29 static base::LazyInstance<base::ThreadLocalPointer<WorkerThread> > lazy_tls = 30 static base::LazyInstance<base::ThreadLocalPointer<WorkerThread> > lazy_tls =
30 LAZY_INSTANCE_INITIALIZER; 31 LAZY_INSTANCE_INITIALIZER;
31 32
32 WorkerThread::WorkerThread() { 33 WorkerThread::WorkerThread() {
33 lazy_tls.Pointer()->Set(this); 34 lazy_tls.Pointer()->Set(this);
34 webkit_platform_support_.reset(new WorkerWebKitPlatformSupportImpl); 35 webkit_platform_support_.reset(new WorkerWebKitPlatformSupportImpl);
35 WebKit::initialize(webkit_platform_support_.get()); 36 WebKit::initialize(webkit_platform_support_.get());
37 WebKit::setIDBFactory(
38 webkit_platform_support_.get()->idbFactory());
36 39
37 appcache_dispatcher_.reset(new AppCacheDispatcher(this)); 40 appcache_dispatcher_.reset(new AppCacheDispatcher(this));
38 41
39 web_database_observer_impl_.reset( 42 web_database_observer_impl_.reset(
40 new WebDatabaseObserverImpl(sync_message_filter())); 43 new WebDatabaseObserverImpl(sync_message_filter()));
41 WebKit::WebDatabase::setObserver(web_database_observer_impl_.get()); 44 WebKit::WebDatabase::setObserver(web_database_observer_impl_.get());
42 db_message_filter_ = new DBMessageFilter(); 45 db_message_filter_ = new DBMessageFilter();
43 channel()->AddFilter(db_message_filter_.get()); 46 channel()->AddFilter(db_message_filter_.get());
44 47
45 indexed_db_message_filter_ = new IndexedDBMessageFilter; 48 indexed_db_message_filter_ = new IndexedDBMessageFilter;
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 125
123 void WorkerThread::RemoveWorkerStub(WebSharedWorkerStub* stub) { 126 void WorkerThread::RemoveWorkerStub(WebSharedWorkerStub* stub) {
124 worker_stubs_.erase(stub); 127 worker_stubs_.erase(stub);
125 } 128 }
126 129
127 void WorkerThread::AddWorkerStub(WebSharedWorkerStub* stub) { 130 void WorkerThread::AddWorkerStub(WebSharedWorkerStub* stub) {
128 worker_stubs_.insert(stub); 131 worker_stubs_.insert(stub);
129 } 132 }
130 133
131 } // namespace content 134 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698