diff options
| author | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-26 17:06:25 +0000 |
|---|---|---|
| committer | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-26 17:06:25 +0000 |
| commit | a96020adcdae0734b9cd542ad6ab6648c7377853 (patch) | |
| tree | 271a95af5238d03feb13590bb3a8f80d651fb057 | |
| parent | 76633153e57548d4d9968f61e3927ed8f0745ddf (diff) | |
| download | chromium_src-a96020adcdae0734b9cd542ad6ab6648c7377853.zip chromium_src-a96020adcdae0734b9cd542ad6ab6648c7377853.tar.gz chromium_src-a96020adcdae0734b9cd542ad6ab6648c7377853.tar.bz2 | |
Merge 162122 - Add a flag to enable the deprecated PeerConnection00
Let the deprecated PeerConnection00 API be controlled by the flag --enable-deprecated-peer-connection.
Since this is functionality on its way out this flag won't be visible in chrome:flags.
BUG=155822
Review URL: https://chromiumcodereview.appspot.com/11156002
TBR=tommyw@chromium.org
Review URL: https://codereview.chromium.org/11304009
git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@164347 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/public/common/content_switches.cc | 4 | ||||
| -rw-r--r-- | content/public/common/content_switches.h | 1 | ||||
| -rw-r--r-- | content/renderer/render_thread_impl.cc | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc index 03e6958..924d3aa 100644 --- a/content/public/common/content_switches.cc +++ b/content/public/common/content_switches.cc @@ -293,6 +293,10 @@ const char kEnableLogging[] = "enable-logging"; // Disable Media Source API on <audio>/<video> elements. const char kDisableMediaSource[] = "disable-media-source"; +// Enables the deprecated PeerConnection functionality. +const char kEnableDeprecatedPeerConnection[] = + "enable-deprecated-peer-connection"; + // On Windows, converts the page to the currently-installed monitor profile. // This does NOT enable color management for images. The source is still // assumed to be sRGB. diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h index fcfb2a6..362b05e 100644 --- a/content/public/common/content_switches.h +++ b/content/public/common/content_switches.h @@ -104,6 +104,7 @@ extern const char kEnableGestureTapHighlight[]; extern const char kEnableGpuBenchmarking[]; CONTENT_EXPORT extern const char kEnableLogging[]; extern const char kDisableMediaSource[]; +extern const char kEnableDeprecatedPeerConnection[]; extern const char kEnableMonitorProfile[]; extern const char kEnablePartialSwap[]; extern const char kEnableUIReleaseFrontSurface[]; diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 467dfb8..b623656a 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -654,6 +654,8 @@ void RenderThreadImpl::EnsureWebKitInitialized() { WebKit::WebRuntimeFeatures::enableMediaStream(true); WebKit::WebRuntimeFeatures::enablePeerConnection(true); + WebKit::WebRuntimeFeatures::enableDeprecatedPeerConnection( + command_line.HasSwitch(switches::kEnableDeprecatedPeerConnection)); WebKit::WebRuntimeFeatures::enableFullScreenAPI( !command_line.HasSwitch(switches::kDisableFullScreen)); |