summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/renderer_glue.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-10 02:53:47 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-10 02:53:47 +0000
commitddd8d5e5cf7f916268e9429ebe3cf5be65268630 (patch)
tree933df07c4805e8ff7db44d8de13cbd0ff6be370a /chrome/renderer/renderer_glue.cc
parent59cfa77428e0458a2d46784cb618fb2ec757038e (diff)
downloadchromium_src-ddd8d5e5cf7f916268e9429ebe3cf5be65268630.zip
chromium_src-ddd8d5e5cf7f916268e9429ebe3cf5be65268630.tar.gz
chromium_src-ddd8d5e5cf7f916268e9429ebe3cf5be65268630.tar.bz2
Linux: open shared memory in browser rather than renderer (like on mac).
BUG=40448 TEST=copy image into gimp from sandboxed chrome. also, gtk_clipboard_dump shows image data on clipboard Review URL: http://codereview.chromium.org/1517029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44179 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/renderer_glue.cc')
-rw-r--r--chrome/renderer/renderer_glue.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index e4f8dd9..bf879be18 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -93,8 +93,8 @@ void ScopedClipboardWriterGlue::WriteBitmapFromPixels(const void* pixels,
uint32 buf_size = 4 * size.width() * size.height();
// Allocate a shared memory buffer to hold the bitmap bits.
-#if defined(OS_MACOSX)
- // On OS X, we need to ask the browser to create the shared memory for us,
+#if defined(OS_POSIX)
+ // On POSIX, we need to ask the browser to create the shared memory for us,
// since this is blocked by the sandbox.
base::SharedMemoryHandle shared_mem_handle;
ViewHostMsg_AllocateSharedMemoryBuffer *msg =
@@ -115,7 +115,7 @@ void ScopedClipboardWriterGlue::WriteBitmapFromPixels(const void* pixels,
NOTREACHED() << "Browser allocation request message failed";
return;
}
-#else
+#else // !OS_POSIX
shared_buf_ = new base::SharedMemory;
const bool created = shared_buf_ && shared_buf_->Create(
L"", false /* read write */, true /* open existing */, buf_size);
@@ -123,7 +123,7 @@ void ScopedClipboardWriterGlue::WriteBitmapFromPixels(const void* pixels,
NOTREACHED();
return;
}
-#endif // !OS_MACOSX
+#endif
// Copy the bits into shared memory
memcpy(shared_buf_->memory(), pixels, buf_size);