IndexedDB: Keep the utility process open.

chrome/browser/in_process_webkit/browser_webkitclient_impl.cc

 // Copyright (c) 2010 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/browser/in_process_webkit/browser_webkitclient_impl.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h"
 #include "chrome/browser/in_process_webkit/indexed_db_key_utility_client.h"
 #include "chrome/common/indexed_db_key.h"
 #include "chrome/common/serialized_script_value.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSerializedScriptValue.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
 #include "webkit/glue/webkit_glue.h"
 
 BrowserWebKitClientImpl::BrowserWebKitClientImpl() {
   file_utilities_.set_sandbox_enabled(false);
 }
 
+BrowserWebKitClientImpl::~BrowserWebKitClientImpl() {
+}
+
 WebKit::WebClipboard* BrowserWebKitClientImpl::clipboard() {
   NOTREACHED();
   return NULL;
 }
 
 WebKit::WebMimeRegistry* BrowserWebKitClientImpl::mimeRegistry() {
   NOTREACHED();
   return NULL;
 }
 
@@ skipping 104 matching lines @@
     NOTREACHED();
     return NULL;
 }
 
 int BrowserWebKitClientImpl::databaseDeleteFile(
     const WebKit::WebString& vfs_file_name, bool sync_dir) {
   const FilePath path = webkit_glue::WebStringToFilePath(vfs_file_name);
   return file_util::Delete(path, false) ? 0 : 1;
 }
 
+void BrowserWebKitClientImpl::idbShutdown() {
+  if (indexed_db_key_utility_client_.get())
+    indexed_db_key_utility_client_->EndUtilityProcess();
+}
+
 void BrowserWebKitClientImpl::createIDBKeysFromSerializedValuesAndKeyPath(
     const WebKit::WebVector<WebKit::WebSerializedScriptValue>& values,
     const WebKit::WebString& keyPath,
     WebKit::WebVector<WebKit::WebIDBKey>& keys) {
-  // TODO(bulach): we need to figure out a way to keep the utility process
-  // running for longer, and shut it down when no longer used.
-  scoped_refptr<IndexedDBKeyUtilityClient> indexed_db_key_utility_client(
-      new IndexedDBKeyUtilityClient());
-  indexed_db_key_utility_client->StartUtilityProcess();
+  if (!indexed_db_key_utility_client_.get()) {
+    indexed_db_key_utility_client_ = new IndexedDBKeyUtilityClient();
+    indexed_db_key_utility_client_->StartUtilityProcess();
+  }
 
   std::vector<SerializedScriptValue> std_values;
   size_t size = values.size();
   std_values.reserve(size);
   for (size_t i = 0; i < size; ++i)
     std_values.push_back(SerializedScriptValue(values[i]));
 
   std::vector<IndexedDBKey> std_keys;
-  indexed_db_key_utility_client->CreateIDBKeysFromSerializedValuesAndKeyPath(
+  indexed_db_key_utility_client_->CreateIDBKeysFromSerializedValuesAndKeyPath(
       std_values, keyPath, &std_keys);
 
-  indexed_db_key_utility_client->EndUtilityProcess();
-
   keys = std_keys;
 }