diff options
| author | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 18:16:06 +0000 |
|---|---|---|
| committer | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 18:16:06 +0000 |
| commit | 54e3dfa2e76af401751b676e6fa150499734e9e6 (patch) | |
| tree | 9b0487732aeaaa36491be79936aa044b47ab8b49 /app | |
| parent | 71572873eb78084971b4d1bdd6560f876dc2fada (diff) | |
| download | chromium_src-54e3dfa2e76af401751b676e6fa150499734e9e6.zip chromium_src-54e3dfa2e76af401751b676e6fa150499734e9e6.tar.gz chromium_src-54e3dfa2e76af401751b676e6fa150499734e9e6.tar.bz2 | |
Fix up SharedMemory implementation so that it is more equivalent on Windows vs Posix and enforces exclusive creates.
Clean up some naming to make it clearer what size you are getting by changing max_size to created_size.
BUG=NONE
TEST=BUILD
Review URL: http://codereview.chromium.org/4034006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64097 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
| -rw-r--r-- | app/clipboard/clipboard_unittest.cc | 3 | ||||
| -rw-r--r-- | app/surface/transport_dib_mac.cc | 8 | ||||
| -rw-r--r-- | app/surface/transport_dib_win.cc | 3 |
3 files changed, 3 insertions, 11 deletions
diff --git a/app/clipboard/clipboard_unittest.cc b/app/clipboard/clipboard_unittest.cc index 0685fb7..28056d4 100644 --- a/app/clipboard/clipboard_unittest.cc +++ b/app/clipboard/clipboard_unittest.cc @@ -255,8 +255,7 @@ TEST_F(ClipboardTest, SharedBitmapTest) { // Create shared memory region. base::SharedMemory shared_buf; - ASSERT_TRUE(shared_buf.Create("", false, true, bytes)); - ASSERT_TRUE(shared_buf.Map(bytes)); + ASSERT_TRUE(shared_buf.CreateAndMapAnonymous(bytes)); memcpy(shared_buf.memory(), fake_bitmap, bytes); base::SharedMemoryHandle handle_to_share; base::ProcessHandle current_process = base::kNullProcessHandle; diff --git a/app/surface/transport_dib_mac.cc b/app/surface/transport_dib_mac.cc index a3eb0bb..c3f3abd2 100644 --- a/app/surface/transport_dib_mac.cc +++ b/app/surface/transport_dib_mac.cc @@ -28,13 +28,7 @@ TransportDIB::~TransportDIB() { // static TransportDIB* TransportDIB::Create(size_t size, uint32 sequence_num) { TransportDIB* dib = new TransportDIB; - if (!dib->shared_memory_.Create("", false /* read write */, - false /* do not open existing */, size)) { - delete dib; - return NULL; - } - - if (!dib->shared_memory_.Map(size)) { + if (!dib->shared_memory_.CreateAndMapAnonymous(size)) { delete dib; return NULL; } diff --git a/app/surface/transport_dib_win.cc b/app/surface/transport_dib_win.cc index f7746e3..63506b2 100644 --- a/app/surface/transport_dib_win.cc +++ b/app/surface/transport_dib_win.cc @@ -29,8 +29,7 @@ TransportDIB* TransportDIB::Create(size_t size, uint32 sequence_num) { TransportDIB* dib = new TransportDIB; - if (!dib->shared_memory_.Create("", false /* read write */, - true /* open existing */, size)) { + if (!dib->shared_memory_.CreateAnonymous(size)) { delete dib; return NULL; } |