summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host/render_widget_helper.h
diff options
context:
space:
mode:
authordspringer@google.com <dspringer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-08 22:35:38 +0000
committerdspringer@google.com <dspringer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-08 22:35:38 +0000
commitada848b1ae7e1ac9bcf19adf66d457b61edecd1a (patch)
tree9ca00d98dda446acf8e913bb3363f89a77f24f0e /chrome/browser/renderer_host/render_widget_helper.h
parent4381198d840e71ee89d8d27b22dcad8fa4863e6a (diff)
downloadchromium_src-ada848b1ae7e1ac9bcf19adf66d457b61edecd1a.zip
chromium_src-ada848b1ae7e1ac9bcf19adf66d457b61edecd1a.tar.gz
chromium_src-ada848b1ae7e1ac9bcf19adf66d457b61edecd1a.tar.bz2
Fix Pepper2D on the Mac so that it runs in the sandbox. Note that trusted
plugins still have to run outside of the sandbox (this is not a regression). This CL allows untrusted Pepper 2D plugins to run in the sandbox on the Mac. BUG=40701 TEST=pepper_test_plugin (has to run w/ --no-sandbox on Mac), run any untrusted .nexe that uses Pepper 2D or 3D (examples are inthe NaCl SDK). Review URL: http://codereview.chromium.org/1558032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host/render_widget_helper.h')
-rw-r--r--chrome/browser/renderer_host/render_widget_helper.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/renderer_host/render_widget_helper.h b/chrome/browser/renderer_host/render_widget_helper.h
index 728bb7c..53b336c 100644
--- a/chrome/browser/renderer_host/render_widget_helper.h
+++ b/chrome/browser/renderer_host/render_widget_helper.h
@@ -128,8 +128,14 @@ class RenderWidgetHelper
int* route_id);
#if defined(OS_MACOSX)
- // Called on the IO thread to handle the allocation of a transport DIB
- void AllocTransportDIB(size_t size, TransportDIB::Handle* result);
+ // Called on the IO thread to handle the allocation of a TransportDIB. If
+ // |cache_in_browser| is |true|, then a copy of the shmem is kept by the
+ // browser, and it is the caller's repsonsibility to call
+ // FreeTransportDIB(). In all cases, the caller is responsible for deleting
+ // the resulting TransportDIB.
+ void AllocTransportDIB(size_t size,
+ bool cache_in_browser,
+ TransportDIB::Handle* result);
// Called on the IO thread to handle the freeing of a transport DIB
void FreeTransportDIB(TransportDIB::Id dib_id);