<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[203954] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/203954">203954</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-31 01:31:14 -0700 (Sun, 31 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK][Unix] Implement missing WebKit::SharedMemory::create() function
https://bugs.webkit.org/show_bug.cgi?id=160364
Patch by Adrian Perez de Castro <aperez@igalia.com> 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().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformunixSharedMemoryUnixcpp">trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (203953 => 203954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-07-31 07:04:57 UTC (rev 203953)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-31 08:31:14 UTC (rev 203954)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+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().
+
</ins><span class="cx"> 2016-07-30 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Xcode] WebKit.framework is touched on incremental build even if nothing’s changed
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformunixSharedMemoryUnixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp (203953 => 203954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp 2016-07-31 07:04:57 UTC (rev 203953)
+++ trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp 2016-07-31 08:31:14 UTC (rev 203954)
</span><span class="lines">@@ -93,8 +93,21 @@
</span><span class="cx"> m_attachment = WTFMove(attachment);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<SharedMemory> SharedMemory::allocate(size_t size)
</del><ins>+static inline int accessModeMMap(SharedMemory::Protection protection)
</ins><span class="cx"> {
</span><ins>+ 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)
+{
</ins><span class="cx"> CString tempName;
</span><span class="cx">
</span><span class="cx"> int fileDescriptor = -1;
</span><span class="lines">@@ -119,7 +132,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void* data = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fileDescriptor, 0);
</del><ins>+ void* data = mmap(address, size, accessModeMMap(protection), MAP_SHARED, fileDescriptor, 0);
</ins><span class="cx"> if (data == MAP_FAILED) {
</span><span class="cx"> closeWithRetry(fileDescriptor);
</span><span class="cx"> shm_unlink(tempName.data());
</span><span class="lines">@@ -135,17 +148,9 @@
</span><span class="cx"> return instance.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline int accessModeMMap(SharedMemory::Protection protection)
</del><ins>+RefPtr<SharedMemory> SharedMemory::allocate(size_t size)
</ins><span class="cx"> {
</span><del>- 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;
</del><ins>+ return SharedMemory::create(nullptr, size, SharedMemory::Protection::ReadWrite);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<SharedMemory> SharedMemory::map(const Handle& handle, Protection protection)
</span></span></pre>
</div>
</div>
</body>
</html>