diff options
| -rw-r--r-- | content/browser/renderer_host/render_process_host_impl.cc | 2 | ||||
| -rw-r--r-- | content/public/common/content_switches.cc | 6 | ||||
| -rw-r--r-- | content/public/common/content_switches.h | 2 | ||||
| -rw-r--r-- | content/renderer/render_thread_impl.cc | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 009b731..1f9ff8d 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -677,7 +677,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kDisableGLSLTranslator, switches::kDisableGpuDriverBugWorkarounds, switches::kDisableGpuVsync, - switches::kDisableIndexedDatabase, switches::kDisableJavaScriptI18NAPI, switches::kDisableLocalStorage, switches::kDisableLogging, @@ -692,6 +691,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kEnableGamepad, switches::kEnableGPUServiceLogging, switches::kEnableGPUClientLogging, + switches::kEnableIndexedDBForWorkers, switches::kEnableLogging, switches::kEnableMediaSource, switches::kEnableMediaStream, diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc index a9e1083..f0f2c8d 100644 --- a/content/public/common/content_switches.cc +++ b/content/public/common/content_switches.cc @@ -111,9 +111,6 @@ const char kDisableHangMonitor[] = "disable-hang-monitor"; // messages. const char kDisableGpuWatchdog[] = "disable-gpu-watchdog"; -// Disable the Indexed Database API. -const char kDisableIndexedDatabase[] = "disable-indexed-database"; - // Prevent Java from running. const char kDisableJava[] = "disable-java"; @@ -205,6 +202,9 @@ const char kEnableGamepad[] = "enable-gamepad"; // Enable the GPU plugin and Pepper 3D rendering. const char kEnableGPUPlugin[] = "enable-gpu-plugin"; +// Allow web workers to access the Indexed Database API. +const char kEnableIndexedDBForWorkers[] = "enable-indexeddb-for-workers"; + // Force logging to be enabled. Logging is disabled by default in release // builds. const char kEnableLogging[] = "enable-logging"; diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h index d1d805f16..03ea8ea 100644 --- a/content/public/common/content_switches.h +++ b/content/public/common/content_switches.h @@ -45,7 +45,7 @@ extern const char kDisableGpuDriverBugWorkarounds[]; extern const char kDisableGpuSandbox[]; extern const char kDisableGpuWatchdog[]; CONTENT_EXPORT extern const char kDisableHangMonitor[]; -extern const char kDisableIndexedDatabase[]; +extern const char kEnableIndexedDBForWorkers[]; CONTENT_EXPORT extern const char kDisableJava[]; CONTENT_EXPORT extern const char kDisableJavaScript[]; extern const char kDisableJavaScriptI18NAPI[]; diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 219d4f0..943a704 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -490,7 +490,7 @@ void RenderThreadImpl::EnsureWebKitInitialized() { !command_line.HasSwitch(switches::kDisableSessionStorage)); WebRuntimeFeatures::enableIndexedDatabase( - !command_line.HasSwitch(switches::kDisableIndexedDatabase)); + command_line.HasSwitch(switches::kEnableIndexedDBForWorkers)); WebRuntimeFeatures::enableGeolocation( !command_line.HasSwitch(switches::kDisableGeolocation)); |