mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

media: Replace ENABLE_PEPPER_CDMS buildflag with ENABLE_LIBRARY_CDMS

Browse source 
https://chromium-review.googlesource.com/582309
This commit is contained in:
Aleksei Kuzmin 2017-11-23 21:37:38 +01:00 • committed by Cheng Zhao
parent e59f788c43
commit 8c0c1e4ded
6 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

9
chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.cc
View file

@ -9,6 +9,7 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/common/webplugininfo.h"
#include "content/public/browser/plugin_service.h"
#include "media/media_features.h"
using content::PluginService;
using content::WebPluginInfo;
@ -24,17 +25,17 @@ WidevineCdmMessageFilter::WidevineCdmMessageFilter(
bool WidevineCdmMessageFilter::OnMessageReceived(const IPC::Message& message) {
IPC_BEGIN_MESSAGE_MAP(WidevineCdmMessageFilter, message)
#if BUILDFLAG(ENABLE_PEPPER_CDMS)
#if BUILDFLAG(ENABLE_LIBRARY_CDMS)
IPC_MESSAGE_HANDLER(
ChromeViewHostMsg_IsInternalPluginAvailableForMimeType,
OnIsInternalPluginAvailableForMimeType)
#endif
#endif // BUILDFLAG(ENABLE_LIBRARY_CDMS)
IPC_MESSAGE_UNHANDLED(return false)
IPC_END_MESSAGE_MAP()
return true;
}
#if BUILDFLAG(ENABLE_PEPPER_CDMS)
#if BUILDFLAG(ENABLE_LIBRARY_CDMS)
void WidevineCdmMessageFilter::OnIsInternalPluginAvailableForMimeType(
const std::string& mime_type,
bool* is_available,
@ -60,7 +61,7 @@ void WidevineCdmMessageFilter::OnIsInternalPluginAvailableForMimeType(
*is_available = false;
}
#endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
#endif // BUILDFLAG(ENABLE_LIBRARY_CDMS)
void WidevineCdmMessageFilter::OnDestruct() const {
BrowserThread::DeleteOnUIThread::Destruct(this);

5
chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.h
View file

@ -7,6 +7,7 @@
#include "chrome/common/widevine_cdm_messages.h"
#include "content/public/browser/browser_message_filter.h"
#include "media/media_features.h"
namespace content {
class BrowserContext;
@ -25,7 +26,7 @@ class WidevineCdmMessageFilter : public content::BrowserMessageFilter {
virtual ~WidevineCdmMessageFilter();
#if BUILDFLAG(ENABLE_PEPPER_CDMS)
#if BUILDFLAG(ENABLE_LIBRARY_CDMS)
// Returns whether any internal plugin supporting |mime_type| is registered
// and enabled. Does not determine whether the plugin can actually be
// instantiated (e.g. whether it has all its dependencies).
@ -38,7 +39,7 @@ class WidevineCdmMessageFilter : public content::BrowserMessageFilter {
bool* is_available,
std::vector<base::string16>* additional_param_names,
std::vector<base::string16>* additional_param_values);
#endif
#endif // BUILDFLAG(ENABLE_LIBRARY_CDMS)
int render_process_id_;
content::BrowserContext* browser_context_;