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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 378353002: Pepper: Allow Compositor and VideoDecode on dev channel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 946687896a4ca4f7bb1b39ec9612a3b7c13c485b..c49da3c3b6f7019c901da3b18b7da5b7c6d87969 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -1480,7 +1480,11 @@ bool ChromeContentRendererClient::IsPluginAllowedToUseCompositorAPI(
if (CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnablePepperTesting))
return true;
- return IsExtensionOrSharedModuleWhitelisted(url, allowed_compositor_origins_);
+ if (IsExtensionOrSharedModuleWhitelisted(url, allowed_compositor_origins_))
+ return true;
+
+ chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
+ return channel <= chrome::VersionInfo::CHANNEL_DEV;
#else
return false;
#endif
@@ -1492,8 +1496,12 @@ bool ChromeContentRendererClient::IsPluginAllowedToUseVideoDecodeAPI(
if (CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnablePepperTesting))
return true;
- return IsExtensionOrSharedModuleWhitelisted(url,
- allowed_video_decode_origins_);
+
+ if (IsExtensionOrSharedModuleWhitelisted(url, allowed_video_decode_origins_))
+ return true;
+
+ chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
+ return channel <= chrome::VersionInfo::CHANNEL_DEV;
#else
return false;
#endif
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698