Changeset 82651 in webkit

Timestamp:

Mar 31, 2011 6:05:40 PM (13 years ago)

Author:

Adam Roben

Message:

Add SharedMemory::adopt, which can take ownership of an existing file mapping object

Fixes <​http://webkit.org/b/57599> Need a way to wrap an existing file mapping object in a
SharedMemory

Reviewed by Anders Carlsson.

• Platform/SharedMemory.h: Added adopt.

• Platform/win/SharedMemoryWin.cpp:

(WebKit::SharedMemory::create): Moved code to adopt the HANDLE from here...
(WebKit::SharedMemory::adopt): ...to here.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/SharedMemory.h (modified) (1 diff)
• Platform/win/SharedMemoryWin.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-03-31  Adam Roben  <aroben@apple.com>
+
+        Add SharedMemory::adopt, which can take ownership of an existing file mapping object
+
+        Fixes <http://webkit.org/b/57599> Need a way to wrap an existing file mapping object in a
+        SharedMemory
+
+        Reviewed by Anders Carlsson.
+
+        * Platform/SharedMemory.h: Added adopt.
+
+        * Platform/win/SharedMemoryWin.cpp:
+        (WebKit::SharedMemory::create): Moved code to adopt the HANDLE from here...
+        (WebKit::SharedMemory::adopt): ...to here.
+
 2011-03-31  Chang Shu  <cshu@webkit.org>
 

trunk/Source/WebKit2/Platform/SharedMemory.h

@@ -83 +83 @@
     static PassRefPtr<SharedMemory> create(const Handle&, Protection);
     
+#if PLATFORM(WIN)
+    static PassRefPtr<SharedMemory> adopt(HANDLE, size_t, Protection);
+#endif
+
     ~SharedMemory();
 

trunk/Source/WebKit2/Platform/win/SharedMemoryWin.cpp

@@ -146 +146 @@
 PassRefPtr<SharedMemory> SharedMemory::create(const Handle& handle, Protection protection)
 {
-    if (handle.isNull())
+    RefPtr<SharedMemory> memory = adopt(handle.m_handle, handle.m_size, protection);
+    if (!memory)
+        return 0;
+
+    // The SharedMemory object now owns the HANDLE.
+    handle.m_handle = 0;
+
+    return memory.release();
+}
+
+PassRefPtr<SharedMemory> SharedMemory::adopt(HANDLE handle, size_t size, Protection protection)
+{
+    if (!handle)
         return 0;
 
     DWORD desiredAccess = accessRights(protection);
 
-    void* baseAddress = ::MapViewOfFile(handle.m_handle, desiredAccess, 0, 0, handle.m_size);
+    void* baseAddress = ::MapViewOfFile(handle, desiredAccess, 0, 0, size);
     ASSERT_WITH_MESSAGE(baseAddress, "::MapViewOfFile failed with error %lu", ::GetLastError());
     if (!baseAddress)
@@ -157 +169 @@
 
     RefPtr<SharedMemory> memory = adoptRef(new SharedMemory);
-    memory->m_size = handle.m_size;
+    memory->m_size = size;
     memory->m_data = baseAddress;
-
-    // Adopt the HANDLE.
-    memory->m_handle = handle.m_handle;
-    handle.m_handle = 0;
+    memory->m_handle = handle;
 
     return memory.release();