summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-15 20:38:27 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-15 20:38:27 +0000
commit761d741bf748f632cd1ff766f2305d5f329c2ccc (patch)
tree51558a782f86b23ecf2d124202a07a5eab960b08 /ppapi
parentb31e62e05fe81c166f724aef5e02e099a5bc30de (diff)
downloadchromium_src-761d741bf748f632cd1ff766f2305d5f329c2ccc.zip
chromium_src-761d741bf748f632cd1ff766f2305d5f329c2ccc.tar.gz
chromium_src-761d741bf748f632cd1ff766f2305d5f329c2ccc.tar.bz2
Merge branch 'master' into perms_pdf
Add PPAPI permissions for PDF. This is a reland of part of r167727. Original review URL: https://codereview.chromium.org/11365235 R=raymes git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/proxy/ppb_pdf_proxy.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/ppapi/proxy/ppb_pdf_proxy.cc b/ppapi/proxy/ppb_pdf_proxy.cc
index e06b806..1deb959 100644
--- a/ppapi/proxy/ppb_pdf_proxy.cc
+++ b/ppapi/proxy/ppb_pdf_proxy.cc
@@ -155,6 +155,10 @@ const InterfaceProxy::Info* PPB_PDF_Proxy::GetInfo() {
}
bool PPB_PDF_Proxy::OnMessageReceived(const IPC::Message& msg) {
+ // This is a private interface, plugin must have permission.
+ if (!dispatcher()->permissions().HasPermission(PERMISSION_PRIVATE))
+ return false;
+
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(PPB_PDF_Proxy, msg)
IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBPDF_GetFontFileWithFallback,