| OLD | NEW |
| 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/utility/utility_thread_impl.h" | 5 #include "content/utility/utility_thread_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 | 94 |
| 95 void UtilityThreadImpl::OnIDBKeysFromValuesAndKeyPath( | 95 void UtilityThreadImpl::OnIDBKeysFromValuesAndKeyPath( |
| 96 int id, | 96 int id, |
| 97 const std::vector<content::SerializedScriptValue>& serialized_script_values, | 97 const std::vector<content::SerializedScriptValue>& serialized_script_values, |
| 98 const content::IndexedDBKeyPath& idb_key_path) { | 98 const content::IndexedDBKeyPath& idb_key_path) { |
| 99 std::vector<WebKit::WebSerializedScriptValue> web_values; | 99 std::vector<WebKit::WebSerializedScriptValue> web_values; |
| 100 ConvertVector(serialized_script_values, &web_values); | 100 ConvertVector(serialized_script_values, &web_values); |
| 101 std::vector<WebKit::WebIDBKey> web_keys; | 101 std::vector<WebKit::WebIDBKey> web_keys; |
| 102 webkit_glue::IDBKeysFromValuesAndKeyPath( | 102 webkit_glue::IDBKeysFromValuesAndKeyPath( |
| 103 web_values, idb_key_path, &web_keys); | 103 web_values, idb_key_path, &web_keys); |
| 104 std::vector<IndexedDBKey> keys; | 104 std::vector<content::IndexedDBKey> keys; |
| 105 ConvertVector(web_keys, &keys); | 105 ConvertVector(web_keys, &keys); |
| 106 Send(new UtilityHostMsg_IDBKeysFromValuesAndKeyPath_Succeeded(id, keys)); | 106 Send(new UtilityHostMsg_IDBKeysFromValuesAndKeyPath_Succeeded(id, keys)); |
| 107 ReleaseProcessIfNeeded(); | 107 ReleaseProcessIfNeeded(); |
| 108 } | 108 } |
| 109 | 109 |
| 110 void UtilityThreadImpl::OnInjectIDBKey( | 110 void UtilityThreadImpl::OnInjectIDBKey( |
| 111 const IndexedDBKey& key, | 111 const content::IndexedDBKey& key, |
| 112 const content::SerializedScriptValue& value, | 112 const content::SerializedScriptValue& value, |
| 113 const content::IndexedDBKeyPath& key_path) { | 113 const content::IndexedDBKeyPath& key_path) { |
| 114 content::SerializedScriptValue new_value( | 114 content::SerializedScriptValue new_value( |
| 115 webkit_glue::InjectIDBKey(key, value, key_path)); | 115 webkit_glue::InjectIDBKey(key, value, key_path)); |
| 116 Send(new UtilityHostMsg_InjectIDBKey_Finished(new_value)); | 116 Send(new UtilityHostMsg_InjectIDBKey_Finished(new_value)); |
| 117 ReleaseProcessIfNeeded(); | 117 ReleaseProcessIfNeeded(); |
| 118 } | 118 } |
| 119 | 119 |
| 120 void UtilityThreadImpl::OnBatchModeStarted() { | 120 void UtilityThreadImpl::OnBatchModeStarted() { |
| 121 batch_mode_ = true; | 121 batch_mode_ = true; |
| (...skipping 30 matching lines...) Expand all Loading... |
| 152 webkit::WebPluginInfo plugin; | 152 webkit::WebPluginInfo plugin; |
| 153 if (!plugin_list->LoadPlugin(plugin_paths[i], &plugin_groups, &plugin)) | 153 if (!plugin_list->LoadPlugin(plugin_paths[i], &plugin_groups, &plugin)) |
| 154 Send(new UtilityHostMsg_LoadPluginFailed(i, plugin_paths[i])); | 154 Send(new UtilityHostMsg_LoadPluginFailed(i, plugin_paths[i])); |
| 155 else | 155 else |
| 156 Send(new UtilityHostMsg_LoadedPlugin(i, plugin)); | 156 Send(new UtilityHostMsg_LoadedPlugin(i, plugin)); |
| 157 } | 157 } |
| 158 | 158 |
| 159 ReleaseProcessIfNeeded(); | 159 ReleaseProcessIfNeeded(); |
| 160 } | 160 } |
| 161 #endif | 161 #endif |
| OLD | NEW |