Changeset 203954 in webkit

Timestamp:

Jul 31, 2016 1:31:14 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK][Unix] Implement missing WebKit::SharedMemory::create() function
​https://bugs.webkit.org/show_bug.cgi?id=160364

Patch by Adrian Perez de Castro <Adrian Perez de Castro> on 2016-07-31
Reviewed by Carlos Garcia Campos.

The WebKit::SharedMemory::create() function is missing for the Unix
platform, which is also used by the GTK+ port. The latter is going
to need this in place to use the common content filtering code.

• Platform/unix/SharedMemoryUnix.cpp:

(WebKit::accessModeMMap): Added helper function to convert a
SharedMemory::Protection value into flags useable with mmap().
(WebKit::SharedMemory::create): Added. Implementation reuses code
existing in the SharedMemory::allocate() function.
(WebKit::SharedMemory::allocate): Reimplemented in terms of
SharedMemory::create().

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/unix/SharedMemoryUnix.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-07-31  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [GTK][Unix] Implement missing WebKit::SharedMemory::create() function
+        https://bugs.webkit.org/show_bug.cgi?id=160364
+
+        Reviewed by Carlos Garcia Campos.
+
+        The WebKit::SharedMemory::create() function is missing for the Unix
+        platform, which is also used by the GTK+ port. The latter is going
+        to need this in place to use the common content filtering code.
+
+        * Platform/unix/SharedMemoryUnix.cpp:
+        (WebKit::accessModeMMap): Added helper function to convert a
+        SharedMemory::Protection value into flags useable with mmap().
+        (WebKit::SharedMemory::create): Added. Implementation reuses code
+        existing in the SharedMemory::allocate() function.
+        (WebKit::SharedMemory::allocate): Reimplemented in terms of
+        SharedMemory::create().
+
 2016-07-30  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp

@@ -94 +94 @@
 }
 
-RefPtr<SharedMemory> SharedMemory::allocate(size_t size)
+static inline int accessModeMMap(SharedMemory::Protection protection)
+{
+    switch (protection) {
+    case SharedMemory::Protection::ReadOnly:
+        return PROT_READ;
+    case SharedMemory::Protection::ReadWrite:
+        return PROT_READ | PROT_WRITE;
+    }
+
+    ASSERT_NOT_REACHED();
+    return PROT_READ | PROT_WRITE;
+}
+
+RefPtr<SharedMemory> SharedMemory::create(void* address, size_t size, Protection protection)
 {
     CString tempName;
@@ -120 +133 @@
     }
 
-    void* data = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fileDescriptor, 0);
+    void* data = mmap(address, size, accessModeMMap(protection), MAP_SHARED, fileDescriptor, 0);
     if (data == MAP_FAILED) {
         closeWithRetry(fileDescriptor);
@@ -136 +149 @@
 }
 
-static inline int accessModeMMap(SharedMemory::Protection protection)
-{
-    switch (protection) {
-    case SharedMemory::Protection::ReadOnly:
-        return PROT_READ;
-    case SharedMemory::Protection::ReadWrite:
-        return PROT_READ | PROT_WRITE;
-    }
-
-    ASSERT_NOT_REACHED();
-    return PROT_READ | PROT_WRITE;
+RefPtr<SharedMemory> SharedMemory::allocate(size_t size)
+{
+    return SharedMemory::create(nullptr, size, SharedMemory::Protection::ReadWrite);
 }