diff options
| author | dspringer@google.com <dspringer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 22:35:38 +0000 |
|---|---|---|
| committer | dspringer@google.com <dspringer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 22:35:38 +0000 |
| commit | ada848b1ae7e1ac9bcf19adf66d457b61edecd1a (patch) | |
| tree | 9ca00d98dda446acf8e913bb3363f89a77f24f0e /chrome/common/render_messages_internal.h | |
| parent | 4381198d840e71ee89d8d27b22dcad8fa4863e6a (diff) | |
| download | chromium_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/common/render_messages_internal.h')
| -rw-r--r-- | chrome/common/render_messages_internal.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index 1654850..17e5689 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -1869,8 +1869,14 @@ IPC_BEGIN_MESSAGES(ViewHost) // On OSX, we cannot allocated shared memory from within the sandbox, so // this call exists for the renderer to ask the browser to allocate memory // on its behalf. We return a file descriptor to the POSIX shared memory. - IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_AllocTransportDIB, + // If the |cache_in_browser| flag is |true|, then a copy of the shmem is kept + // by the browser, and it is the caller's repsonsibility to send a + // ViewHostMsg_FreeTransportDIB message in order to release the cached shmem. + // In all cases, the caller is responsible for deleting the resulting + // TransportDIB. + IPC_SYNC_MESSAGE_CONTROL2_1(ViewHostMsg_AllocTransportDIB, size_t, /* bytes requested */ + bool, /* cache in the browser */ TransportDIB::Handle /* DIB */) // Since the browser keeps handles to the allocated transport DIBs, this |