<!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>[160421] branches/safari-537.74-branch/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/160421">160421</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2013-12-11 03:58:05 -0800 (Wed, 11 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/159173">r159173</a>. <rdar://problem/15474120></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53774branchSourceWebKit2ChangeLog">branches/safari-537.74-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari53774branchSourceWebKit2NetworkProcessNetworkConnectionToWebProcessmessagesin">branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in</a></li>
<li><a href="#branchessafari53774branchSourceWebKit2NetworkProcessSynchronousNetworkLoaderClientcpp">branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp</a></li>
<li><a href="#branchessafari53774branchSourceWebKit2NetworkProcessSynchronousNetworkLoaderClienth">branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h</a></li>
<li><a href="#branchessafari53774branchSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp">branches/safari-537.74-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53774branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebKit2/ChangeLog (160420 => 160421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebKit2/ChangeLog 2013-12-11 11:34:08 UTC (rev 160420)
+++ branches/safari-537.74-branch/Source/WebKit2/ChangeLog 2013-12-11 11:58:05 UTC (rev 160421)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2013-12-11 Lucas Forschler <lforschler@apple.com>
+
+ Merge r159173
+
+ 2013-11-12 Anders Carlsson <andersca@apple.com>
+
+ fast/canvas/webgl/draw-arrays-out-of-bounds.html is flaky on Mavericks WK2 testers, fails about 20% of the time
+ https://bugs.webkit.org/show_bug.cgi?id=124223
+ <rdar://problem/15333977>
+
+ Reviewed by Tim Horton.
+
+ It's wrong to use DataReferences in sync IPC replies; the underlying MessageDecoder will be freed after the call to
+ sendSync returns and the DataReference will point to freed memory. Use a Vector<char> instead.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+ * NetworkProcess/SynchronousNetworkLoaderClient.cpp:
+ (WebKit::SynchronousNetworkLoaderClient::didReceiveBuffer):
+ (WebKit::SynchronousNetworkLoaderClient::sendDelayedReply):
+ * NetworkProcess/SynchronousNetworkLoaderClient.h:
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::loadResourceSynchronously):
+
</ins><span class="cx"> 2013-11-13 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r159248
</span></span></pre></div>
<a id="branchessafari53774branchSourceWebKit2NetworkProcessNetworkConnectionToWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in (160420 => 160421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2013-12-11 11:34:08 UTC (rev 160420)
+++ branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2013-12-11 11:58:05 UTC (rev 160421)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> messages -> NetworkConnectionToWebProcess LegacyReceiver {
</span><span class="cx">
</span><span class="cx"> ScheduleResourceLoad(WebKit::NetworkResourceLoadParameters resourceLoadParameters)
</span><del>- PerformSynchronousLoad(WebKit::NetworkResourceLoadParameters resourceLoadParameters) -> (WebCore::ResourceError error, WebCore::ResourceResponse response, CoreIPC::DataReference data) Delayed
</del><ins>+ PerformSynchronousLoad(WebKit::NetworkResourceLoadParameters resourceLoadParameters) -> (WebCore::ResourceError error, WebCore::ResourceResponse response, Vector<char> data) Delayed
</ins><span class="cx"> RemoveLoadIdentifier(uint64_t resourceLoadIdentifier)
</span><span class="cx">
</span><span class="cx"> ServePendingRequests(uint32_t resourceLoadPriority)
</span></span></pre></div>
<a id="branchessafari53774branchSourceWebKit2NetworkProcessSynchronousNetworkLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp (160420 => 160421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp 2013-12-11 11:34:08 UTC (rev 160420)
+++ branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp 2013-12-11 11:58:05 UTC (rev 160421)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> // It's unclear if the potential complexities of that approach are worth it.
</span><span class="cx">
</span><span class="cx"> if (!m_responseData)
</span><del>- m_responseData = adoptPtr(new Vector<uint8_t>);
</del><ins>+ m_responseData = adoptPtr(new Vector<char>);
</ins><span class="cx">
</span><span class="cx"> m_responseData->append(buffer->data(), buffer->size());
</span><span class="cx"> }
</span><span class="lines">@@ -106,15 +106,12 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_delayedReply);
</span><span class="cx">
</span><del>- uint8_t* bytes = m_responseData ? m_responseData->data() : 0;
- size_t size = m_responseData ? m_responseData->size() : 0;
-
</del><span class="cx"> if (m_response.isNull()) {
</span><span class="cx"> ASSERT(!m_error.isNull());
</span><span class="cx"> //platformSynthesizeErrorResponse();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_delayedReply->send(m_error, m_response, CoreIPC::DataReference(bytes, size));
</del><ins>+ m_delayedReply->send(m_error, m_response, m_responseData ? *m_responseData : Vector<char>());
</ins><span class="cx"> m_delayedReply = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53774branchSourceWebKit2NetworkProcessSynchronousNetworkLoaderClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h (160420 => 160421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h 2013-12-11 11:34:08 UTC (rev 160420)
+++ branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h 2013-12-11 11:58:05 UTC (rev 160421)
</span><span class="lines">@@ -70,8 +70,7 @@
</span><span class="cx"> RefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply> m_delayedReply;
</span><span class="cx"> WebCore::ResourceResponse m_response;
</span><span class="cx"> WebCore::ResourceError m_error;
</span><del>- OwnPtr<Vector<uint8_t>> m_responseData;
-
</del><ins>+ OwnPtr<Vector<char>> m_responseData;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari53774branchSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (160420 => 160421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2013-12-11 11:34:08 UTC (rev 160420)
+++ branches/safari-537.74-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2013-12-11 11:58:05 UTC (rev 160421)
</span><span class="lines">@@ -233,8 +233,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CoreIPC::DataReference dataReference;
-
</del><span class="cx"> NetworkResourceLoadParameters loadParameters;
</span><span class="cx"> loadParameters.identifier = resourceLoadIdentifier;
</span><span class="cx"> loadParameters.request = request;
</span><span class="lines">@@ -245,16 +243,14 @@
</span><span class="cx"> loadParameters.inPrivateBrowsingMode = context->storageSession().isPrivateBrowsingSession();
</span><span class="cx"> loadParameters.shouldClearReferrerOnHTTPSToHTTPRedirect = context->shouldClearReferrerOnHTTPSToHTTPRedirect();
</span><span class="cx">
</span><del>- if (!WebProcess::shared().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad(loadParameters), Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::Reply(error, response, dataReference), 0)) {
</del><ins>+ data.resize(0);
+
+ if (!WebProcess::shared().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad(loadParameters), Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::Reply(error, response, data), 0)) {
</ins><span class="cx"> response = ResourceResponse();
</span><span class="cx"> error = internalError(request.url());
</span><del>- data.resize(0);
</del><span class="cx">
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
- data.resize(dataReference.size());
- memcpy(data.data(), dataReference.data(), dataReference.size());
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(BLOB)
</span></span></pre>
</div>
</div>
</body>
</html>