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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 845823002: PPAPI: Remove whitelist checks for PPB_VideoDecoder now that it's stable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comments. Created 5 years, 11 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 unified diff | Download patch
OLDNEW
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 "chrome/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug/crash_logging.h" 8 #include "base/debug/crash_logging.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 175
176 namespace { 176 namespace {
177 177
178 ChromeContentRendererClient* g_current_client; 178 ChromeContentRendererClient* g_current_client;
179 179
180 #if defined(ENABLE_PLUGINS) 180 #if defined(ENABLE_PLUGINS)
181 const char* const kPredefinedAllowedCompositorOrigins[] = { 181 const char* const kPredefinedAllowedCompositorOrigins[] = {
182 "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see crbug.com/383937 182 "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see crbug.com/383937
183 "4EB74897CB187C7633357C2FE832E0AD6A44883A" // see crbug.com/383937 183 "4EB74897CB187C7633357C2FE832E0AD6A44883A" // see crbug.com/383937
184 }; 184 };
185
186 const char* const kPredefinedAllowedVideoDecodeOrigins[] = {
187 "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see crbug.com/383937
188 "4EB74897CB187C7633357C2FE832E0AD6A44883A" // see crbug.com/383937
189 };
190 #endif 185 #endif
191 186
192 void AppendParams(const std::vector<base::string16>& additional_names, 187 void AppendParams(const std::vector<base::string16>& additional_names,
193 const std::vector<base::string16>& additional_values, 188 const std::vector<base::string16>& additional_values,
194 WebVector<WebString>* existing_names, 189 WebVector<WebString>* existing_names,
195 WebVector<WebString>* existing_values) { 190 WebVector<WebString>* existing_values) {
196 DCHECK(additional_names.size() == additional_values.size()); 191 DCHECK(additional_names.size() == additional_values.size());
197 DCHECK(existing_names->size() == existing_values->size()); 192 DCHECK(existing_names->size() == existing_values->size());
198 193
199 size_t existing_size = existing_names->size(); 194 size_t existing_size = existing_names->size();
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 272
278 #if defined(ENABLE_EXTENSIONS) 273 #if defined(ENABLE_EXTENSIONS)
279 extensions::ExtensionsClient::Set( 274 extensions::ExtensionsClient::Set(
280 extensions::ChromeExtensionsClient::GetInstance()); 275 extensions::ChromeExtensionsClient::GetInstance());
281 extensions::ExtensionsRendererClient::Set( 276 extensions::ExtensionsRendererClient::Set(
282 ChromeExtensionsRendererClient::GetInstance()); 277 ChromeExtensionsRendererClient::GetInstance());
283 #endif 278 #endif
284 #if defined(ENABLE_PLUGINS) 279 #if defined(ENABLE_PLUGINS)
285 for (size_t i = 0; i < arraysize(kPredefinedAllowedCompositorOrigins); ++i) 280 for (size_t i = 0; i < arraysize(kPredefinedAllowedCompositorOrigins); ++i)
286 allowed_compositor_origins_.insert(kPredefinedAllowedCompositorOrigins[i]); 281 allowed_compositor_origins_.insert(kPredefinedAllowedCompositorOrigins[i]);
287 for (size_t i = 0; i < arraysize(kPredefinedAllowedVideoDecodeOrigins); ++i)
288 allowed_video_decode_origins_.insert(
289 kPredefinedAllowedVideoDecodeOrigins[i]);
290 #endif 282 #endif
291 } 283 }
292 284
293 ChromeContentRendererClient::~ChromeContentRendererClient() { 285 ChromeContentRendererClient::~ChromeContentRendererClient() {
294 g_current_client = NULL; 286 g_current_client = NULL;
295 } 287 }
296 288
297 void ChromeContentRendererClient::RenderThreadStarted() { 289 void ChromeContentRendererClient::RenderThreadStarted() {
298 RenderThread* thread = RenderThread::Get(); 290 RenderThread* thread = RenderThread::Get();
299 291
(...skipping 1277 matching lines...) Expand 10 before | Expand all | Expand 10 after
1577 if (IsExtensionOrSharedModuleWhitelisted(url, allowed_compositor_origins_)) 1569 if (IsExtensionOrSharedModuleWhitelisted(url, allowed_compositor_origins_))
1578 return true; 1570 return true;
1579 1571
1580 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); 1572 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
1581 return channel <= chrome::VersionInfo::CHANNEL_DEV; 1573 return channel <= chrome::VersionInfo::CHANNEL_DEV;
1582 #else 1574 #else
1583 return false; 1575 return false;
1584 #endif 1576 #endif
1585 } 1577 }
1586 1578
1587 bool ChromeContentRendererClient::IsPluginAllowedToUseVideoDecodeAPI(
1588 const GURL& url) {
1589 #if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS)
1590 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
1591 switches::kEnablePepperTesting))
1592 return true;
1593
1594 if (IsExtensionOrSharedModuleWhitelisted(url, allowed_video_decode_origins_))
1595 return true;
1596
1597 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
1598 return channel <= chrome::VersionInfo::CHANNEL_DEV;
1599 #else
1600 return false;
1601 #endif
1602 }
1603
1604 content::BrowserPluginDelegate* 1579 content::BrowserPluginDelegate*
1605 ChromeContentRendererClient::CreateBrowserPluginDelegate( 1580 ChromeContentRendererClient::CreateBrowserPluginDelegate(
1606 content::RenderFrame* render_frame, 1581 content::RenderFrame* render_frame,
1607 const std::string& mime_type, 1582 const std::string& mime_type,
1608 const GURL& original_url) { 1583 const GURL& original_url) {
1609 #if defined(ENABLE_EXTENSIONS) 1584 #if defined(ENABLE_EXTENSIONS)
1610 if (mime_type == content::kBrowserPluginMimeType) { 1585 if (mime_type == content::kBrowserPluginMimeType) {
1611 return new extensions::ExtensionsGuestViewContainer(render_frame); 1586 return new extensions::ExtensionsGuestViewContainer(render_frame);
1612 } else { 1587 } else {
1613 return new extensions::MimeHandlerViewContainer( 1588 return new extensions::MimeHandlerViewContainer(
1614 render_frame, mime_type, original_url); 1589 render_frame, mime_type, original_url);
1615 } 1590 }
1616 #else 1591 #else
1617 return NULL; 1592 return NULL;
1618 #endif 1593 #endif
1619 } 1594 }
OLDNEW
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.h ('k') | content/public/renderer/content_renderer_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698