Get IPC working for Indexed DB in shared workers.

content/worker/worker_thread.cc

 // Copyright (c) 2011 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/worker/worker_thread.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
 #include "content/common/appcache/appcache_dispatcher.h"
 #include "content/common/db_message_filter.h"
+#include "content/renderer/indexed_db/indexed_db_message_filter.h"

[jsbell, 2012/02/09 23:23:56]

I assume this is moving, so order will become correct.

 #include "content/common/web_database_observer_impl.h"
 #include "content/common/worker_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/worker/websharedworker_stub.h"
 #include "content/worker/worker_webkitplatformsupport_impl.h"
 #include "ipc/ipc_sync_channel.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebBlobRegistry.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
@@ skipping 10 matching lines @@
   webkit_platform_support_.reset(new WorkerWebKitPlatformSupportImpl);
   WebKit::initialize(webkit_platform_support_.get());
 
   appcache_dispatcher_.reset(new AppCacheDispatcher(this));
 
   web_database_observer_impl_.reset(new WebDatabaseObserverImpl(this));
   WebKit::WebDatabase::setObserver(web_database_observer_impl_.get());
   db_message_filter_ = new DBMessageFilter();
   channel()->AddFilter(db_message_filter_.get());
 
+  indexed_db_message_filter_ = new IndexedDBMessageFilter;
+  channel()->AddFilter(indexed_db_message_filter_.get());
+
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
   webkit_glue::EnableWebCoreLogChannels(
       command_line.GetSwitchValueASCII(switches::kWebCoreLogChannels));
 
   WebKit::WebRuntimeFeatures::enableDatabase(
       !command_line.HasSwitch(switches::kDisableDatabases));
 
   WebKit::WebRuntimeFeatures::enableApplicationCache(
       !command_line.HasSwitch(switches::kDisableApplicationCache));
 
 #if defined(OS_WIN)
   // We don't yet support notifications on non-Windows, so hide it from pages.
   WebRuntimeFeatures::enableNotifications(
       !command_line.HasSwitch(switches::kDisableDesktopNotifications));
 #endif
 
   WebRuntimeFeatures::enableSockets(
       !command_line.HasSwitch(switches::kDisableWebSockets));
 
   WebRuntimeFeatures::enableFileSystem(
       !command_line.HasSwitch(switches::kDisableFileSystem));
 }
 
 WorkerThread::~WorkerThread() {
   // Shutdown in reverse of the initialization order.
+  channel()->RemoveFilter(indexed_db_message_filter_.get());
+  indexed_db_message_filter_ = NULL;
+
   channel()->RemoveFilter(db_message_filter_.get());
   db_message_filter_ = NULL;
 
   WebKit::shutdown();
   lazy_tls.Pointer()->Set(NULL);
 }
 
 WorkerThread* WorkerThread::current() {
   return lazy_tls.Pointer()->Get();
 }
@@ skipping 31 matching lines @@
   }
 }
 
 void WorkerThread::RemoveWorkerStub(WebSharedWorkerStub* stub) {
   worker_stubs_.erase(stub);
 }
 
 void WorkerThread::AddWorkerStub(WebSharedWorkerStub* stub) {
   worker_stubs_.insert(stub);
 }