<!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>[167992] releases/WebKitGTK/webkit-2.2/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/167992">167992</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-30 01:37:35 -0700 (Wed, 30 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/167128">r167128</a> - wk2-gtk does not display anything
https://bugs.webkit.org/show_bug.cgi?id=125558
Reviewed by Martin Robinson.
Remove fcntl call to set access mode flags on the duplicated files
descriptor. Those flags are ignored in Linux and make fcntl to
fail in FreeBSD. We should handle the case where the passed
protection is ReadOnly.
Thanks to Raphael Kubo da Costa who proposed the solution.
* Platform/unix/SharedMemoryUnix.cpp:
(WebKit::SharedMemory::createHandle):
(WebKit::accessModeFile): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit22SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceWebKit2PlatformunixSharedMemoryUnixcpp">releases/WebKitGTK/webkit-2.2/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit22SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog (167991 => 167992)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog 2014-04-30 08:35:13 UTC (rev 167991)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog 2014-04-30 08:37:35 UTC (rev 167992)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-04-11 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ wk2-gtk does not display anything
+ https://bugs.webkit.org/show_bug.cgi?id=125558
+
+ Reviewed by Martin Robinson.
+
+ Remove fcntl call to set access mode flags on the duplicated files
+ descriptor. Those flags are ignored in Linux and make fcntl to
+ fail in FreeBSD. We should handle the case where the passed
+ protection is ReadOnly.
+ Thanks to Raphael Kubo da Costa who proposed the solution.
+
+ * Platform/unix/SharedMemoryUnix.cpp:
+ (WebKit::SharedMemory::createHandle):
+ (WebKit::accessModeFile): Deleted.
+
</ins><span class="cx"> 2014-04-11 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK][WK2] Move Vector objects into WebEditorClient::executePendingEditorCommands() invocations
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceWebKit2PlatformunixSharedMemoryUnixcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp (167991 => 167992)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp 2014-04-30 08:35:13 UTC (rev 167991)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp 2014-04-30 08:37:35 UTC (rev 167992)
</span><span class="lines">@@ -174,24 +174,14 @@
</span><span class="cx"> closeWithRetry(m_fileDescriptor);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline int accessModeFile(SharedMemory::Protection protection)
</del><ins>+bool SharedMemory::createHandle(Handle& handle, Protection)
</ins><span class="cx"> {
</span><del>- switch (protection) {
- case SharedMemory::ReadOnly:
- return O_RDONLY;
- case SharedMemory::ReadWrite:
- return O_RDWR;
- }
-
- ASSERT_NOT_REACHED();
- return O_RDWR;
-}
-
-bool SharedMemory::createHandle(Handle& handle, Protection protection)
-{
</del><span class="cx"> ASSERT_ARG(handle, !handle.m_size);
</span><span class="cx"> ASSERT_ARG(handle, handle.isNull());
</span><span class="cx">
</span><ins>+ // FIXME: Handle the case where the passed Protection is ReadOnly.
+ // See https://bugs.webkit.org/show_bug.cgi?id=131542.
+
</ins><span class="cx"> int duplicatedHandle;
</span><span class="cx"> while ((duplicatedHandle = dup(m_fileDescriptor)) == -1) {
</span><span class="cx"> if (errno != EINTR) {
</span><span class="lines">@@ -200,7 +190,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- while (fcntl(duplicatedHandle, F_SETFD, FD_CLOEXEC) == -1 || fcntl(duplicatedHandle, F_SETFL, accessModeFile(protection)) == -1) {
</del><ins>+ while (fcntl(duplicatedHandle, F_SETFD, FD_CLOEXEC) == -1) {
</ins><span class="cx"> if (errno != EINTR) {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> closeWithRetry(duplicatedHandle);
</span></span></pre>
</div>
</div>
</body>
</html>