diff options
| author | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-18 01:50:22 +0000 |
|---|---|---|
| committer | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-18 01:50:22 +0000 |
| commit | e4e68dbb4bcb437f62b37fcc055ae6d40d5d49bb (patch) | |
| tree | fd20a85fd7a574c88104dd020c1c5644d618136c /content | |
| parent | d2798d24c2eec2bd03c833506746428bb857802c (diff) | |
| download | chromium_src-e4e68dbb4bcb437f62b37fcc055ae6d40d5d49bb.zip chromium_src-e4e68dbb4bcb437f62b37fcc055ae6d40d5d49bb.tar.gz chromium_src-e4e68dbb4bcb437f62b37fcc055ae6d40d5d49bb.tar.bz2 | |
Pointer lock added to about:flags and passed to WebKit runtime flags
BUG=72754
Review URL: http://codereview.chromium.org/8536003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110632 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_process_host_impl.cc | 1 | ||||
| -rw-r--r-- | content/public/common/content_switches.cc | 3 | ||||
| -rw-r--r-- | content/public/common/content_switches.h | 1 | ||||
| -rw-r--r-- | content/renderer/render_thread_impl.cc | 3 |
4 files changed, 8 insertions, 0 deletions
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index cd5f9b4b..0f29bc9 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -686,6 +686,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kEnableStrictSiteIsolation, switches::kDisableFullScreen, switches::kEnablePepperTesting, + switches::kEnablePointerLock, #if defined(OS_MACOSX) // Allow this to be set when invoking the browser and relayed along. switches::kEnableSandboxLogging, diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc index 8db4315..5654714 100644 --- a/content/public/common/content_switches.cc +++ b/content/public/common/content_switches.cc @@ -196,6 +196,9 @@ const char kEnableDeviceMotion[] = "enable-device-motion"; // Enable the JavaScript Full Screen API. const char kDisableFullScreen[] = "disable-fullscreen"; +// Enable the JavaScript Pointer Lock API. +const char kEnablePointerLock[] = "enable-pointer-lock"; + // Enable the Gamepad API const char kEnableGamepad[] = "enable-gamepad"; diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h index 14c677a..aa96c27 100644 --- a/content/public/common/content_switches.h +++ b/content/public/common/content_switches.h @@ -71,6 +71,7 @@ CONTENT_EXPORT extern const char kEnableCompositingForFixedPosition[]; CONTENT_EXPORT extern const char kEnableDNSCertProvenanceChecking[]; CONTENT_EXPORT extern const char kEnableDeviceMotion[]; CONTENT_EXPORT extern const char kDisableFullScreen[]; +extern const char kEnablePointerLock[]; extern const char kEnableGamepad[]; extern const char kEnableGPUPlugin[]; CONTENT_EXPORT extern const char kEnableLogging[]; diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index ea2b109..f74e1f5 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -486,6 +486,9 @@ void RenderThreadImpl::EnsureWebKitInitialized() { WebKit::WebRuntimeFeatures::enableFullScreenAPI( !command_line.HasSwitch(switches::kDisableFullScreen)); + WebKit::WebRuntimeFeatures::enablePointerLock( + command_line.HasSwitch(switches::kEnablePointerLock)); + WebKit::WebRuntimeFeatures::enableVideoTrack( command_line.HasSwitch(switches::kEnableVideoTrack)); |