| 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/renderer/renderer_webkitplatformsupport_impl.h" | 5 #include "content/renderer/renderer_webkitplatformsupport_impl.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
| 10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| (...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 RendererWebKitPlatformSupportImpl::createLocalStorageNamespace( | 355 RendererWebKitPlatformSupportImpl::createLocalStorageNamespace( |
| 356 const WebString& path, unsigned quota) { | 356 const WebString& path, unsigned quota) { |
| 357 return new WebStorageNamespaceImpl(); | 357 return new WebStorageNamespaceImpl(); |
| 358 } | 358 } |
| 359 | 359 |
| 360 | 360 |
| 361 //------------------------------------------------------------------------------ | 361 //------------------------------------------------------------------------------ |
| 362 | 362 |
| 363 WebIDBFactory* RendererWebKitPlatformSupportImpl::idbFactory() { | 363 WebIDBFactory* RendererWebKitPlatformSupportImpl::idbFactory() { |
| 364 if (!web_idb_factory_) { | 364 if (!web_idb_factory_) { |
| 365 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) | 365 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess) && |
| 366 web_idb_factory_.reset(WebIDBFactory::create()); | 366 !CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewIndexedDB)) |
| 367 web_idb_factory_.reset(WebIDBFactory::create()); |
| 367 else | 368 else |
| 368 web_idb_factory_.reset(new RendererWebIDBFactoryImpl()); | 369 web_idb_factory_.reset(new RendererWebIDBFactoryImpl()); |
| 369 } | 370 } |
| 370 return web_idb_factory_.get(); | 371 return web_idb_factory_.get(); |
| 371 } | 372 } |
| 372 | 373 |
| 373 //------------------------------------------------------------------------------ | 374 //------------------------------------------------------------------------------ |
| 374 | 375 |
| 375 WebFileSystem* RendererWebKitPlatformSupportImpl::fileSystem() { | 376 WebFileSystem* RendererWebKitPlatformSupportImpl::fileSystem() { |
| 376 if (!web_file_system_) | 377 if (!web_file_system_) |
| (...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 901 } | 902 } |
| 902 | 903 |
| 903 //------------------------------------------------------------------------------ | 904 //------------------------------------------------------------------------------ |
| 904 | 905 |
| 905 WebKit::WebCompositorSupport* | 906 WebKit::WebCompositorSupport* |
| 906 RendererWebKitPlatformSupportImpl::compositorSupport() { | 907 RendererWebKitPlatformSupportImpl::compositorSupport() { |
| 907 return &compositor_support_; | 908 return &compositor_support_; |
| 908 } | 909 } |
| 909 | 910 |
| 910 } // namespace content | 911 } // namespace content |
| OLD | NEW |