[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [158165] branches/safari-537.73-branch
From: lforschler () apple ! com
Date: 2013-10-29 3:10:49
Message-ID: 20131029031049.44F26303921 () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[158165] branches/safari-537.73-branch</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/158165">158165</a></dd> \
<dt>Author</dt> <dd>lforschler@apple.com</dd> <dt>Date</dt> <dd>2013-10-28 20:10:48 \
-0700 (Mon, 28 Oct 2013)</dd> </dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/157298">r157298</a>. \
<rdar://problem/15292359></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53773branchLayoutTestsChangeLog">branches/safari-537.73-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53773branchLayoutTestsTestExpectations">branches/safari-537.73-branch/LayoutTests/TestExpectations</a></li>
<li><a href="#branchessafari53773branchSourceWebCoreChangeLog">branches/safari-537.73-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53773branchSourceWebCoreplatformgraphicsDisplayRefreshMon \
itorcpp">branches/safari-537.73-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53773branchLayoutTestsfastanimationrequestanimationframere \
moveclientexpectedtxt">branches/safari-537.73-branch/LayoutTests/fast/animation/request-animation-frame-remove-client-expected.txt</a></li>
<li><a href="#branchessafari53773branchLayoutTestsfastanimationrequestanimationframer \
emoveclienthtml">branches/safari-537.73-branch/LayoutTests/fast/animation/request-animation-frame-remove-client.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53773branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.73-branch/LayoutTests/ChangeLog (158164 => 158165)</h4> <pre \
class="diff"><span> <span class="info">--- \
branches/safari-537.73-branch/LayoutTests/ChangeLog 2013-10-29 03:05:08 UTC (rev \
158164)
+++ branches/safari-537.73-branch/LayoutTests/ChangeLog 2013-10-29 03:10:48 UTC (rev \
158165) </span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2013-10-28 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r157298
+
+ 2013-10-10 Dean Jackson <dino@apple.com>
+
+ Use after free in \
WebCore::DisplayRefreshMonitorClient::fireDisplayRefreshIfNeeded + \
http://webkit.org/b/121033 +
+ Reviewed by Darin Adler.
+
+ Test that assertion fires if you try to remove potential client while in \
a + animation dispatch.
+
+ * TestExpectations: Mark test as crashing.
+ * fast/animation/request-animation-frame-remove-client-expected.txt: \
Added. + * fast/animation/request-animation-frame-remove-client.html: \
Added. +
+2013-10-28 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r155554
</span><span class="cx">
</span><span class="cx"> 2013-09-11 Myles C. Maxfield \
<mmaxfield@apple.com> </span></span></pre></div>
<a id="branchessafari53773branchLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.73-branch/LayoutTests/TestExpectations (158164 => 158165)</h4> \
<pre class="diff"><span> <span class="info">--- \
branches/safari-537.73-branch/LayoutTests/TestExpectations 2013-10-29 03:05:08 UTC \
(rev 158164)
+++ branches/safari-537.73-branch/LayoutTests/TestExpectations 2013-10-29 03:10:48 \
UTC (rev 158165) </span><span class="lines">@@ -16,4 +16,6 @@
</span><span class="cx"> # \
media/W3C/video/networkState/networkState_during_progress.html is flaky </span><span \
class="cx"> webkit.org/b/76280 \
media/W3C/video/networkState/networkState_during_progress.html [ Pass Failure ] \
</span><span class="cx"> </span><del>-webkit.org/b/118301 \
fast/dom/timer-throttling-hidden-page.html [ Skip ] </del><span class="cx">\ No \
newline at end of file </span><ins>+webkit.org/b/118301 \
fast/dom/timer-throttling-hidden-page.html [ Skip ] +
+webkit.org/b/121033 fast/animation/request-animation-frame-remove-client.html [ Pass \
Crash ] </ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari53773branchLayoutTestsfastanimationrequestanimationframeremovecli \
entexpectedtxtfromrev157298trunkLayoutTestsfastanimationrequestanimationframeremoveclientexpectedtxt"></a>
<div class="copfile"><h4>Copied: \
branches/safari-537.73-branch/LayoutTests/fast/animation/request-animation-frame-remove-client-expected.txt \
(from rev 157298, trunk/LayoutTests/fast/animation/request-animation-frame-remove-client-expected.txt) \
(0 => 158165)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-537.73-branch/LayoutTests/fast/animation/request-animation-frame-remove-client-expected.txt \
(rev 0)
+++ branches/safari-537.73-branch/LayoutTests/fast/animation/request-animation-frame-remove-client-expected.txt 2013-10-29 \
03:10:48 UTC (rev 158165) </span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This test crashes.
+
+
</ins></span></pre></div>
<a id="branchessafari53773branchLayoutTestsfastanimationrequestanimationframeremovecli \
enthtmlfromrev157298trunkLayoutTestsfastanimationrequestanimationframeremoveclienthtml"></a>
<div class="copfile"><h4>Copied: \
branches/safari-537.73-branch/LayoutTests/fast/animation/request-animation-frame-remove-client.html \
(from rev 157298, trunk/LayoutTests/fast/animation/request-animation-frame-remove-client.html) \
(0 => 158165)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-537.73-branch/LayoutTests/fast/animation/request-animation-frame-remove-client.html \
(rev 0)
+++ branches/safari-537.73-branch/LayoutTests/fast/animation/request-animation-frame-remove-client.html 2013-10-29 \
03:10:48 UTC (rev 158165) </span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<p>This test crashes.</p>
+<iframe></iframe>
+<iframe></iframe>
+<iframe></iframe>
+<iframe></iframe>
+
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+
+var frame = document.querySelector("iframe");
+
+window.onload = function() {
+ // Convert NodeList to Array so that we can use forEach.
+ var windows = Array.prototype.slice.call(window.frames);
+ var numOutstandingCalls = windows.length - 1; // Remember we remove one client.
+ windows.forEach(function (win) {
+ win.requestAnimationFrame(function () {});
+ win.requestAnimationFrame(function () {
+ if (frame.parentNode)
+ frame.parentNode.removeChild(frame);
+ numOutstandingCalls--;
+ if (!numOutstandingCalls && window.testRunner)
+ testRunner.notifyDone();
+ });
+ });
+}
+</script>
</ins></span></pre></div>
<a id="branchessafari53773branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.73-branch/Source/WebCore/ChangeLog (158164 => 158165)</h4> <pre \
class="diff"><span> <span class="info">--- \
branches/safari-537.73-branch/Source/WebCore/ChangeLog 2013-10-29 03:05:08 UTC (rev \
158164)
+++ branches/safari-537.73-branch/Source/WebCore/ChangeLog 2013-10-29 03:10:48 UTC \
(rev 158165) </span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2013-10-28 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r157298
+
+ 2013-10-10 Dean Jackson <dino@apple.com>
+
+ Use after free in \
WebCore::DisplayRefreshMonitorClient::fireDisplayRefreshIfNeeded + \
http://webkit.org/b/121033 +
+ Reviewed by Darin Adler.
+
+ Add an ASSERT to detect if an animation client will be removed
+ during the callback dispatch.
+
+ Test: fast/animation/request-animation-frame-remove-client.html
+
+ * platform/graphics/DisplayRefreshMonitor.cpp:
+ (WebCore::DisplayRefreshMonitor::displayDidRefresh):
+
+2013-10-28 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r155554
</span><span class="cx">
</span><span class="cx"> 2013-09-11 Myles C. Maxfield \
<mmaxfield@apple.com> </span></span></pre></div>
<a id="branchessafari53773branchSourceWebCoreplatformgraphicsDisplayRefreshMonitorcpp"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.73-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp \
(158164 => 158165)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-537.73-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp 2013-10-29 \
03:05:08 UTC (rev 158164)
+++ branches/safari-537.73-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp 2013-10-29 \
03:10:48 UTC (rev 158165) </span><span class="lines">@@ -109,8 +109,11 @@
</span><span class="cx">
</span><span class="cx"> Vector<DisplayRefreshMonitorClient*> clients;
</span><span class="cx"> copyToVector(m_clients, clients);
</span><del>- for (size_t i = 0; i < clients.size(); ++i)
- clients[i]->fireDisplayRefreshIfNeeded(monotonicAnimationStartTime);
</del><ins>+ for (size_t i = 0; i < clients.size(); ++i) {
+ DisplayRefreshMonitorClient* client = clients[i];
+ ASSERT(m_clients.contains(client));
+ client->fireDisplayRefreshIfNeeded(monotonicAnimationStartTime);
+ }
</ins><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> MutexLocker lock(m_mutex);
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic