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

Side by Side Diff: content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc

Issue 9667012: Fix --single-process mode issues with GpuChannelHostFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser/in_process_webkit/browser_webkitplatformsupport_impl.h " 5 #include "content/browser/in_process_webkit/browser_webkitplatformsupport_impl.h "
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
9 #include "content/browser/in_process_webkit/dom_storage_message_filter.h" 10 #include "content/browser/in_process_webkit/dom_storage_message_filter.h"
10 #include "content/browser/in_process_webkit/indexed_db_key_utility_client.h" 11 #include "content/browser/in_process_webkit/indexed_db_key_utility_client.h"
11 #include "content/common/indexed_db/indexed_db_key.h" 12 #include "content/common/indexed_db/indexed_db_key.h"
12 #include "content/public/common/serialized_script_value.h" 13 #include "content/public/common/serialized_script_value.h"
13 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.h" 14 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.h"
14 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerialize dScriptValue.h" 15 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerialize dScriptValue.h"
15 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" 16 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
16 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" 17 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
17 #include "webkit/glue/webkit_glue.h" 18 #include "webkit/glue/webkit_glue.h"
18 19
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 keys = std_keys; 170 keys = std_keys;
170 } 171 }
171 172
172 WebKit::WebSerializedScriptValue 173 WebKit::WebSerializedScriptValue
173 BrowserWebKitPlatformSupportImpl::injectIDBKeyIntoSerializedValue( 174 BrowserWebKitPlatformSupportImpl::injectIDBKeyIntoSerializedValue(
174 const WebKit::WebIDBKey& key, const WebKit::WebSerializedScriptValue& value, 175 const WebKit::WebIDBKey& key, const WebKit::WebSerializedScriptValue& value,
175 const WebKit::WebString& keyPath) { 176 const WebKit::WebString& keyPath) {
176 return IndexedDBKeyUtilityClient::InjectIDBKeyIntoSerializedValue( 177 return IndexedDBKeyUtilityClient::InjectIDBKeyIntoSerializedValue(
177 IndexedDBKey(key), content::SerializedScriptValue(value), keyPath); 178 IndexedDBKey(key), content::SerializedScriptValue(value), keyPath);
178 } 179 }
180
181 GpuChannelHostFactory*
182 BrowserWebKitPlatformSupportImpl::GetGpuChannelHostFactory() {
183 return content::BrowserGpuChannelHostFactory::instance();
184 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698