<!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>[183037] branches/safari-600.1.4.16-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/183037">183037</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-04-20 17:17:23 -0700 (Mon, 20 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/181656">r181656</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/182985">r182985</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001416branchLayoutTestsChangeLog">branches/safari-600.1.4.16-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001416branchSourceWebCoreChangeLog">branches/safari-600.1.4.16-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001416branchSourceWebCoreWebCoreexpin">branches/safari-600.1.4.16-branch/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#branchessafari6001416branchSourceWebCoredomScriptedAnimationControllercpp">branches/safari-600.1.4.16-branch/Source/WebCore/dom/ScriptedAnimationController.cpp</a></li>
<li><a href="#branchessafari6001416branchSourceWebCoredomScriptedAnimationControllerh">branches/safari-600.1.4.16-branch/Source/WebCore/dom/ScriptedAnimationController.h</a></li>
<li><a href="#branchessafari6001416branchSourceWebCorepageChromeClienth">branches/safari-600.1.4.16-branch/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#branchessafari6001416branchSourceWebCoreplatformgraphicsDisplayRefreshMonitorcpp">branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp</a></li>
<li><a href="#branchessafari6001416branchSourceWebCoreplatformgraphicsDisplayRefreshMonitorh">branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h</a></li>
<li><a href="#branchessafari6001416branchSourceWebCoreplatformgraphicsDisplayRefreshMonitorClientcpp">branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitorClient.cpp</a></li>
<li><a href="#branchessafari6001416branchSourceWebCoreplatformgraphicsDisplayRefreshMonitorClienth">branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitorClient.h</a></li>
<li><a href="#branchessafari6001416branchSourceWebCoreplatformgraphicsDisplayRefreshMonitorManagercpp">branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitorManager.cpp</a></li>
<li><a href="#branchessafari6001416branchSourceWebCoreplatformgraphicsDisplayRefreshMonitorManagerh">branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitorManager.h</a></li>
<li><a href="#branchessafari6001416branchSourceWebCoreplatformgraphicsGraphicsLayerUpdatercpp">branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/GraphicsLayerUpdater.cpp</a></li>
<li><a href="#branchessafari6001416branchSourceWebCoreplatformgraphicsGraphicsLayerUpdaterh">branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/GraphicsLayerUpdater.h</a></li>
<li><a href="#branchessafari6001416branchSourceWebCorerenderingRenderLayerCompositorcpp">branches/safari-600.1.4.16-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#branchessafari6001416branchSourceWebCorerenderingRenderLayerCompositorh">branches/safari-600.1.4.16-branch/Source/WebCore/rendering/RenderLayerCompositor.h</a></li>
<li><a href="#branchessafari6001416branchSourceWebCoretestingInternalscpp">branches/safari-600.1.4.16-branch/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#branchessafari6001416branchSourceWebCoretestingInternalsh">branches/safari-600.1.4.16-branch/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#branchessafari6001416branchSourceWebCoretestingInternalsidl">branches/safari-600.1.4.16-branch/Source/WebCore/testing/Internals.idl</a></li>
<li><a href="#branchessafari6001416branchSourceWebKit2ChangeLog">branches/safari-600.1.4.16-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001416branchSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#branchessafari6001416branchSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#branchessafari6001416branchSourceWebKit2WebProcessWebPageDrawingAreacpp">branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp</a></li>
<li><a href="#branchessafari6001416branchSourceWebKit2WebProcessWebPageDrawingAreah">branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebPage/DrawingArea.h</a></li>
<li><a href="#branchessafari6001416branchSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah">branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h</a></li>
<li><a href="#branchessafari6001416branchSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001416branchLayoutTestscompositinganimationanimationbackingexpectedtxt">branches/safari-600.1.4.16-branch/LayoutTests/compositing/animation/animation-backing-expected.txt</a></li>
<li><a href="#branchessafari6001416branchLayoutTestscompositinganimationanimationbackinghtml">branches/safari-600.1.4.16-branch/LayoutTests/compositing/animation/animation-backing.html</a></li>
<li><a href="#branchessafari6001416branchLayoutTestsfastanimationrequestanimationframeunparentediframecrashexpectedtxt">branches/safari-600.1.4.16-branch/LayoutTests/fast/animation/request-animation-frame-unparented-iframe-crash-expected.txt</a></li>
<li><a href="#branchessafari6001416branchLayoutTestsfastanimationrequestanimationframeunparentediframecrashhtml">branches/safari-600.1.4.16-branch/LayoutTests/fast/animation/request-animation-frame-unparented-iframe-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001416branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/LayoutTests/ChangeLog (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/LayoutTests/ChangeLog 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/LayoutTests/ChangeLog 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-04-20 Lucas Forschler <lforschler@apple.com>
+
+ Merge 181656 & 182985.
+
+ 2015-04-18 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r181656): Animated tiled layers are missing content
+ https://bugs.webkit.org/show_bug.cgi?id=143911
+ rdar://problem/20596328
+
+ Reviewed by Darin Adler.
+
+ Test that animates a tiled layer, and checks that layer flushes occur while the
+ animation is running.
+
+ * compositing/animation/animation-backing-expected.txt: Added.
+ * compositing/animation/animation-backing.html: Added.
+
+ 2015-03-17 Timothy Horton <timothy_horton@apple.com>
+
+ Reproducible null deref under ScriptedAnimationController::createDisplayRefreshMonitor
+ https://bugs.webkit.org/show_bug.cgi?id=142776
+ <rdar://problem/18921338>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * fast/animation/request-animation-frame-unparented-iframe-crash-expected.txt: Added.
+ * fast/animation/request-animation-frame-unparented-iframe-crash.html: Added.
+ Add a test that ensures that calling requestAnimationFrame on a recently-unparented
+ frame doesn't crash.
+
</ins><span class="cx"> 2015-03-11 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r181351.
</span></span></pre></div>
<a id="branchessafari6001416branchLayoutTestscompositinganimationanimationbackingexpectedtxtfromrev182985trunkLayoutTestscompositinganimationanimationbackingexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.16-branch/LayoutTests/compositing/animation/animation-backing-expected.txt (from rev 182985, trunk/LayoutTests/compositing/animation/animation-backing-expected.txt) (0 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/LayoutTests/compositing/animation/animation-backing-expected.txt (rev 0)
+++ branches/safari-600.1.4.16-branch/LayoutTests/compositing/animation/animation-backing-expected.txt 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Saw layer flushes during animation: PASS
</ins></span></pre></div>
<a id="branchessafari6001416branchLayoutTestscompositinganimationanimationbackinghtmlfromrev182985trunkLayoutTestscompositinganimationanimationbackinghtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.16-branch/LayoutTests/compositing/animation/animation-backing.html (from rev 182985, trunk/LayoutTests/compositing/animation/animation-backing.html) (0 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/LayoutTests/compositing/animation/animation-backing.html (rev 0)
+++ branches/safari-600.1.4.16-branch/LayoutTests/compositing/animation/animation-backing.html 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .mover {
+ height: 100px;
+ width: 3000px;
+ background-color: gray;
+ border: 1px solid black;
+ }
+
+ .mover.animating {
+ animation: move 0.25s forwards linear;
+ }
+
+ @keyframes move {
+ from { transform: translateX(1000px); }
+ to { transform: translateX(-2000px); }
+ }
+ </style>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+ function doTest()
+ {
+ window.setTimeout(function() {
+ var mover = document.getElementById('mover');
+ mover.addEventListener('animationstart', function() {
+ if (window.internals)
+ internals.startTrackingLayerFlushes();
+ });
+
+ mover.addEventListener('animationend', function() {
+ if (window.internals) {
+ var flushCount = internals.layerFlushCount();
+ document.getElementById('result').textContent = flushCount ? "Saw layer flushes during animation: PASS" : "No layer flushes during animation: FAIL";
+ }
+ if (window.testRunner)
+ testRunner.notifyDone();
+ });
+ mover.classList.add('animating');
+ }, 0);
+ }
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+<div id="mover" class="mover"></div>
+<div id="result">This test must be run in the test harness.</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001416branchLayoutTestsfastanimationrequestanimationframeunparentediframecrashexpectedtxtfromrev181656trunkLayoutTestsfastanimationrequestanimationframeunparentediframecrashexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.16-branch/LayoutTests/fast/animation/request-animation-frame-unparented-iframe-crash-expected.txt (from rev 181656, trunk/LayoutTests/fast/animation/request-animation-frame-unparented-iframe-crash-expected.txt) (0 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/LayoutTests/fast/animation/request-animation-frame-unparented-iframe-crash-expected.txt (rev 0)
+++ branches/safari-600.1.4.16-branch/LayoutTests/fast/animation/request-animation-frame-unparented-iframe-crash-expected.txt 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+This test passes if it does not crash.
</ins></span></pre></div>
<a id="branchessafari6001416branchLayoutTestsfastanimationrequestanimationframeunparentediframecrashhtmlfromrev181656trunkLayoutTestsfastanimationrequestanimationframeunparentediframecrashhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.16-branch/LayoutTests/fast/animation/request-animation-frame-unparented-iframe-crash.html (from rev 181656, trunk/LayoutTests/fast/animation/request-animation-frame-unparented-iframe-crash.html) (0 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/LayoutTests/fast/animation/request-animation-frame-unparented-iframe-crash.html (rev 0)
+++ branches/safari-600.1.4.16-branch/LayoutTests/fast/animation/request-animation-frame-unparented-iframe-crash.html 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+
+window.onload = function () {
+ var frame = document.getElementById("frame");
+ var frameWindow = frame.contentWindow;
+ var rAF = frameWindow.requestAnimationFrame;
+
+ frame.parentElement.removeChild(frame);
+ rAF.call(frameWindow, function () { });
+
+ if (window.testRunner)
+ testRunner.notifyDone();
+};
+</script>
+<body>
+<iframe id="frame"></iframe>
+This test passes if it does not crash.
+</body>
</ins></span></pre></div>
<a id="branchessafari6001416branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/ChangeLog (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/ChangeLog 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/ChangeLog 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -1,5 +1,185 @@
</span><span class="cx"> 2015-04-20 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge 181656 and 182985.
+
+ 2015-04-18 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r181656): Animated tiled layers are missing content
+ https://bugs.webkit.org/show_bug.cgi?id=143911
+ rdar://problem/20596328
+
+ Reviewed by Darin Adler.
+
+ After r181656, all requestAnimationFrame was falling back to timers, and not
+ using the platform's DisplayRefreshMonitor, because of a Nullopt vs nullptr
+ fumble. As a result, GraphicsLayerUpdater (which updates tiled layers during
+ animations) was failing to do any updates.
+
+ Replace this confusing Optional<> code with simpler code that just forces the
+ clients to make a DisplayRefreshMonitor if they can, first asking
+ ChromeClient, and then falling back to createDefaultDisplayRefreshMonitor().
+
+ Make lots of things into references, and use C++11 initialization in some places.
+
+ Add Internals API to allow a test to get the number of layer flushes that have
+ occurred.
+
+ * dom/ScriptedAnimationController.cpp:
+ (WebCore::ScriptedAnimationController::ScriptedAnimationController):
+ (WebCore::ScriptedAnimationController::windowScreenDidChange):
+ (WebCore::ScriptedAnimationController::scheduleAnimation):
+ (WebCore::ScriptedAnimationController::createDisplayRefreshMonitor):
+ * dom/ScriptedAnimationController.h:
+ * page/ChromeClient.h:
+ * platform/graphics/DisplayRefreshMonitor.cpp:
+ (WebCore::DisplayRefreshMonitor::createDefaultDisplayRefreshMonitor):
+ (WebCore::DisplayRefreshMonitor::create):
+ (WebCore::DisplayRefreshMonitor::addClient):
+ (WebCore::DisplayRefreshMonitor::removeClient):
+ (WebCore::DisplayRefreshMonitor::displayDidRefresh):
+ * platform/graphics/DisplayRefreshMonitor.h:
+ * platform/graphics/DisplayRefreshMonitorClient.cpp:
+ (WebCore::DisplayRefreshMonitorClient::~DisplayRefreshMonitorClient):
+ * platform/graphics/DisplayRefreshMonitorClient.h:
+ * platform/graphics/DisplayRefreshMonitorManager.cpp:
+ (WebCore::DisplayRefreshMonitorManager::createMonitorForClient):
+ (WebCore::DisplayRefreshMonitorManager::registerClient):
+ (WebCore::DisplayRefreshMonitorManager::unregisterClient):
+ (WebCore::DisplayRefreshMonitorManager::scheduleAnimation):
+ (WebCore::DisplayRefreshMonitorManager::displayDidRefresh):
+ (WebCore::DisplayRefreshMonitorManager::windowScreenDidChange):
+ * platform/graphics/DisplayRefreshMonitorManager.h:
+ * platform/graphics/GraphicsLayerUpdater.cpp:
+ (WebCore::GraphicsLayerUpdater::GraphicsLayerUpdater):
+ (WebCore::GraphicsLayerUpdater::scheduleUpdate):
+ (WebCore::GraphicsLayerUpdater::screenDidChange):
+ (WebCore::GraphicsLayerUpdater::displayRefreshFired):
+ (WebCore::GraphicsLayerUpdater::createDisplayRefreshMonitor):
+ * platform/graphics/GraphicsLayerUpdater.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::RenderLayerCompositor):
+ (WebCore::RenderLayerCompositor::flushPendingLayerChanges):
+ (WebCore::RenderLayerCompositor::notifyFlushBeforeDisplayRefresh):
+ (WebCore::RenderLayerCompositor::flushLayersSoon):
+ (WebCore::RenderLayerCompositor::createDisplayRefreshMonitor):
+ (WebCore::RenderLayerCompositor::startTrackingLayerFlushes):
+ (WebCore::RenderLayerCompositor::layerFlushCount):
+ * rendering/RenderLayerCompositor.h:
+ * testing/Internals.cpp:
+ (WebCore::Internals::startTrackingLayerFlushes):
+ (WebCore::Internals::layerFlushCount):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
+ 2015-03-17 Timothy Horton <timothy_horton@apple.com>
+
+ Reproducible null deref under ScriptedAnimationController::createDisplayRefreshMonitor
+ https://bugs.webkit.org/show_bug.cgi?id=142776
+ <rdar://problem/18921338>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Test: fast/animation/request-animation-frame-unparented-iframe-crash.html
+
+ In some cases (like the new test), we can end up trying to start
+ requestAnimationFrame on a Document that has no Page. Most paths null-checked
+ the Page and did the right thing, but one failed to do so. In addition,
+ the current fallback (when Page is null) can result in us constructing
+ the wrong kind of DisplayRefreshMonitor, which could lead to trouble
+ down the road when it's reused. Instead, just completely avoid making a
+ DisplayRefreshMonitor in the null-page case.
+
+ * dom/ScriptedAnimationController.cpp:
+ (WebCore::ScriptedAnimationController::createDisplayRefreshMonitor):
+ If the page is null, bail.
+
+ * dom/ScriptedAnimationController.h:
+ * platform/graphics/DisplayRefreshMonitor.cpp:
+ (WebCore::DisplayRefreshMonitor::create):
+ Use Optional<> to make it easy to distinguish between ChromeClient
+ being unreachable (because we don't have a Page for some reason) and
+ ChromeClient declaring that it doesn't want to override the type of
+ DisplayRefreshMonitor that is created.
+
+ If ChromeClient was unreachable for some reason, we'll get back an engaged
+ nullptr and return it (instead of creating a DisplayRefreshMonitor based
+ on the platform). This avoids creating the wrong type of DisplayRefreshMonitor
+ in the rare case where we can't reach the ChromeClient (e.g. a freshly unparented
+ IFrame).
+
+ If instead the client returns a disengaged Nullopt, we'll interpret that as
+ "construct the default type", which falls back on the platform #ifdefs to
+ decide what to make.2015-04-18 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r181656): Animated tiled layers are missing content
+ https://bugs.webkit.org/show_bug.cgi?id=143911
+ rdar://problem/20596328
+
+ Reviewed by Darin Adler.
+
+ After r181656, all requestAnimationFrame was falling back to timers, and not
+ using the platform's DisplayRefreshMonitor, because of a Nullopt vs nullptr
+ fumble. As a result, GraphicsLayerUpdater (which updates tiled layers during
+ animations) was failing to do any updates.
+
+ Replace this confusing Optional<> code with simpler code that just forces the
+ clients to make a DisplayRefreshMonitor if they can, first asking
+ ChromeClient, and then falling back to createDefaultDisplayRefreshMonitor().
+
+ Make lots of things into references, and use C++11 initialization in some places.
+
+ Add Internals API to allow a test to get the number of layer flushes that have
+ occurred.
+
+ * dom/ScriptedAnimationController.cpp:
+ (WebCore::ScriptedAnimationController::ScriptedAnimationController):
+ (WebCore::ScriptedAnimationController::windowScreenDidChange):
+ (WebCore::ScriptedAnimationController::scheduleAnimation):
+ (WebCore::ScriptedAnimationController::createDisplayRefreshMonitor):
+ * dom/ScriptedAnimationController.h:
+ * page/ChromeClient.h:
+ * platform/graphics/DisplayRefreshMonitor.cpp:
+ (WebCore::DisplayRefreshMonitor::createDefaultDisplayRefreshMonitor):
+ (WebCore::DisplayRefreshMonitor::create):
+ (WebCore::DisplayRefreshMonitor::addClient):
+ (WebCore::DisplayRefreshMonitor::removeClient):
+ (WebCore::DisplayRefreshMonitor::displayDidRefresh):
+ * platform/graphics/DisplayRefreshMonitor.h:
+ * platform/graphics/DisplayRefreshMonitorClient.cpp:
+ (WebCore::DisplayRefreshMonitorClient::~DisplayRefreshMonitorClient):
+ * platform/graphics/DisplayRefreshMonitorClient.h:
+ * platform/graphics/DisplayRefreshMonitorManager.cpp:
+ (WebCore::DisplayRefreshMonitorManager::createMonitorForClient):
+ (WebCore::DisplayRefreshMonitorManager::registerClient):
+ (WebCore::DisplayRefreshMonitorManager::unregisterClient):
+ (WebCore::DisplayRefreshMonitorManager::scheduleAnimation):
+ (WebCore::DisplayRefreshMonitorManager::displayDidRefresh):
+ (WebCore::DisplayRefreshMonitorManager::windowScreenDidChange):
+ * platform/graphics/DisplayRefreshMonitorManager.h:
+ * platform/graphics/GraphicsLayerUpdater.cpp:
+ (WebCore::GraphicsLayerUpdater::GraphicsLayerUpdater):
+ (WebCore::GraphicsLayerUpdater::scheduleUpdate):
+ (WebCore::GraphicsLayerUpdater::screenDidChange):
+ (WebCore::GraphicsLayerUpdater::displayRefreshFired):
+ (WebCore::GraphicsLayerUpdater::createDisplayRefreshMonitor):
+ * platform/graphics/GraphicsLayerUpdater.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::RenderLayerCompositor):
+ (WebCore::RenderLayerCompositor::flushPendingLayerChanges):
+ (WebCore::RenderLayerCompositor::notifyFlushBeforeDisplayRefresh):
+ (WebCore::RenderLayerCompositor::flushLayersSoon):
+ (WebCore::RenderLayerCompositor::createDisplayRefreshMonitor):
+ (WebCore::RenderLayerCompositor::startTrackingLayerFlushes):
+ (WebCore::RenderLayerCompositor::layerFlushCount):
+ * rendering/RenderLayerCompositor.h:
+ * testing/Internals.cpp:
+ (WebCore::Internals::startTrackingLayerFlushes):
+ (WebCore::Internals::layerFlushCount):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
+2015-04-20 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r180520
</span><span class="cx">
</span><span class="cx"> 2015-02-22 Dean Jackson <dino@apple.com>
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/WebCore.exp.in (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/WebCore.exp.in 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/WebCore.exp.in 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -912,6 +912,7 @@
</span><span class="cx"> __ZN7WebCore21NetworkStorageSession28createPrivateBrowsingSessionERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore21PlatformKeyboardEvent24disambiguateKeyDownEventENS_13PlatformEvent4TypeEb
</span><span class="cx"> __ZN7WebCore21RemoteCommandListener6createERNS_27RemoteCommandListenerClientE
</span><ins>+__ZN7WebCore21RenderLayerCompositor25startTrackingLayerFlushesEv
</ins><span class="cx"> __ZN7WebCore21ResourceLoadScheduler20servePendingRequestsENS_20ResourceLoadPriorityE
</span><span class="cx"> __ZN7WebCore21ResourceLoadScheduler20servePendingRequestsEPNS0_15HostInformationENS_20ResourceLoadPriorityE
</span><span class="cx"> __ZN7WebCore21ResourceLoadScheduler21resumePendingRequestsEv
</span><span class="lines">@@ -1843,6 +1844,7 @@
</span><span class="cx"> __ZNK7WebCore21HTMLFrameOwnerElement15contentDocumentEv
</span><span class="cx"> __ZNK7WebCore21NetworkStorageSession13cookieStorageEv
</span><span class="cx"> __ZNK7WebCore21RenderLayerCompositor11scrollLayerEv
</span><ins>+__ZNK7WebCore21RenderLayerCompositor15layerFlushCountEv
</ins><span class="cx"> __ZNK7WebCore21RenderLayerCompositor15rootRenderLayerEv
</span><span class="cx"> __ZNK7WebCore21UserContentURLPattern7matchesERKNS_3URLE
</span><span class="cx"> __ZNK7WebCore21ViewportConfiguration10layoutSizeEv
</span><span class="lines">@@ -2641,8 +2643,8 @@
</span><span class="cx"> __ZN7WebCore19applicationIsWebAppEv
</span><span class="cx"> __ZN7WebCore19asciiLineBreakTableE
</span><span class="cx"> __ZN7WebCore20PlatformEventFactory27createPlatformKeyboardEventEP8WebEvent
</span><ins>+__ZN7WebCore20ResourceHandleClient22willCacheResponseAsyncEPNS_14ResourceHandleEPK20_CFCachedURLResponse
</ins><span class="cx"> __ZN7WebCore20WebArchivePboardTypeE
</span><del>-__ZN7WebCore20ResourceHandleClient22willCacheResponseAsyncEPNS_14ResourceHandleEPK20_CFCachedURLResponse
</del><span class="cx"> __ZN7WebCore20applicationIsOkCupidEv
</span><span class="cx"> __ZN7WebCore20endOfEditableContentERKNS_15VisiblePositionE
</span><span class="cx"> __ZN7WebCore20lastOffsetForEditingEPKNS_4NodeE
</span><span class="lines">@@ -2974,6 +2976,17 @@
</span><span class="cx"> __ZN7WebCore14ResourceHandle25continueWillCacheResponseEP19NSCachedURLResponse
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(CONTENT_FILTERING)
+__ZN7WebCore13ContentFilter6decodeEP17NSKeyedUnarchiverRS0_
+__ZN7WebCore13ContentFilterC1Ev
+__ZN7WebCore13ContentFilterD1Ev
+__ZNK7WebCore13ContentFilter6encodeEP15NSKeyedArchiver
+#endif
+
+#if USE(CONTENT_FILTERING) && PLATFORM(IOS)
+__ZN7WebCore13ContentFilter43handleUnblockRequestAndDispatchIfSuccessfulERKNS_15ResourceRequestENSt3__18functionIFvvEEE
+#endif
+
</ins><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> __ZN7WebCore11ContextMenu22setPlatformDescriptionEP14NSMutableArray
</span><span class="cx"> __ZN7WebCore12EventHandler20sendContextMenuEventERKNS_18PlatformMouseEventE
</span><span class="lines">@@ -3445,8 +3458,8 @@
</span><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit14exitFullscreenENS_7IntRectE
</span><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit14setCurrentTimeEdd
</span><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit15enterFullscreenEv
</span><ins>+__ZN7WebCore32WebVideoFullscreenInterfaceAVKit15resetMediaStateEv
</ins><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit15setupFullscreenER7CALayerNS_7IntRectEP6UIView
</span><del>-__ZN7WebCore32WebVideoFullscreenInterfaceAVKit15resetMediaStateEv
</del><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit17cleanupFullscreenEv
</span><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit17setSeekableRangesERKNS_10TimeRangesE
</span><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit18setVideoDimensionsEbff
</span><span class="lines">@@ -3469,13 +3482,3 @@
</span><span class="cx"> #if ENABLE(VIEW_MODE_CSS_MEDIA)
</span><span class="cx"> __ZN7WebCore4Page11setViewModeENS0_8ViewModeE
</span><span class="cx"> #endif
</span><del>-
-#if USE(CONTENT_FILTERING)
-#if PLATFORM(IOS)
-__ZN7WebCore13ContentFilter43handleUnblockRequestAndDispatchIfSuccessfulERKNS_15ResourceRequestENSt3__18functionIFvvEEE
-#endif
-__ZN7WebCore13ContentFilter6decodeEP17NSKeyedUnarchiverRS0_
-__ZN7WebCore13ContentFilterC1Ev
-__ZN7WebCore13ContentFilterD1Ev
-__ZNK7WebCore13ContentFilter6encodeEP15NSKeyedArchiver
-#endif
</del></span></pre></div>
<a id="branchessafari6001416branchSourceWebCoredomScriptedAnimationControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/dom/ScriptedAnimationController.cpp (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/dom/ScriptedAnimationController.cpp 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/dom/ScriptedAnimationController.cpp 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -51,16 +51,9 @@
</span><span class="cx">
</span><span class="cx"> ScriptedAnimationController::ScriptedAnimationController(Document* document, PlatformDisplayID displayID)
</span><span class="cx"> : m_document(document)
</span><del>- , m_nextCallbackId(0)
- , m_suspendCount(0)
</del><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_TIMER)
</span><span class="cx"> , m_animationTimer(this, &ScriptedAnimationController::animationTimerFired)
</span><del>- , m_lastAnimationFrameTimeMonotonic(0)
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
- , m_isUsingTimer(false)
- , m_isThrottled(false)
</del><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> {
</span><span class="cx"> windowScreenDidChange(displayID);
</span><span class="cx"> }
</span><span class="lines">@@ -173,7 +166,7 @@
</span><span class="cx"> if (m_document->settings() && !m_document->settings()->requestAnimationFrameEnabled())
</span><span class="cx"> return;
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><del>- DisplayRefreshMonitorManager::sharedManager().windowScreenDidChange(displayID, this);
</del><ins>+ DisplayRefreshMonitorManager::sharedManager().windowScreenDidChange(displayID, *this);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(displayID);
</span><span class="cx"> #endif
</span><span class="lines">@@ -187,7 +180,7 @@
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_TIMER)
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><span class="cx"> if (!m_isUsingTimer && !m_isThrottled) {
</span><del>- if (DisplayRefreshMonitorManager::sharedManager().scheduleAnimation(this))
</del><ins>+ if (DisplayRefreshMonitorManager::sharedManager().scheduleAnimation(*this))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_isUsingTimer = true;
</span><span class="lines">@@ -226,9 +219,15 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><del>-PassRefPtr<DisplayRefreshMonitor> ScriptedAnimationController::createDisplayRefreshMonitor(PlatformDisplayID displayID) const
</del><ins>+RefPtr<DisplayRefreshMonitor> ScriptedAnimationController::createDisplayRefreshMonitor(PlatformDisplayID displayID) const
</ins><span class="cx"> {
</span><del>- return m_document->page()->chrome().client().createDisplayRefreshMonitor(displayID);
</del><ins>+ if (!m_document->page())
+ return nullptr;
+
+ if (auto monitor = m_document->page()->chrome().client().createDisplayRefreshMonitor(displayID))
+ return monitor;
+
+ return DisplayRefreshMonitor::createDefaultDisplayRefreshMonitor(displayID);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebCoredomScriptedAnimationControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/dom/ScriptedAnimationController.h (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/dom/ScriptedAnimationController.h 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/dom/ScriptedAnimationController.h 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -78,23 +78,23 @@
</span><span class="cx"> CallbackList m_callbacks;
</span><span class="cx">
</span><span class="cx"> Document* m_document;
</span><del>- CallbackId m_nextCallbackId;
- int m_suspendCount;
</del><ins>+ CallbackId m_nextCallbackId { 0 };
+ int m_suspendCount { 0 };
</ins><span class="cx">
</span><span class="cx"> void scheduleAnimation();
</span><span class="cx">
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_TIMER)
</span><span class="cx"> void animationTimerFired(Timer<ScriptedAnimationController>&);
</span><span class="cx"> Timer<ScriptedAnimationController> m_animationTimer;
</span><del>- double m_lastAnimationFrameTimeMonotonic;
</del><ins>+ double m_lastAnimationFrameTimeMonotonic { 0 };
</ins><span class="cx">
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><span class="cx"> // Override for DisplayRefreshMonitorClient
</span><span class="cx"> virtual void displayRefreshFired(double timestamp) override;
</span><del>- virtual PassRefPtr<DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const override;
</del><ins>+ virtual RefPtr<DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const override;
</ins><span class="cx">
</span><del>- bool m_isUsingTimer;
- bool m_isThrottled;
</del><ins>+ bool m_isUsingTimer { false };
+ bool m_isThrottled { false };
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/page/ChromeClient.h (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/page/ChromeClient.h 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/page/ChromeClient.h 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> virtual GraphicsLayerFactory* graphicsLayerFactory() const { return nullptr; }
</span><span class="cx">
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><del>- virtual PassRefPtr<DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const { return nullptr; }
</del><ins>+ virtual RefPtr<DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const { return nullptr; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Pass 0 as the GraphicsLayer to detatch the root layer.
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebCoreplatformgraphicsDisplayRefreshMonitorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -35,21 +35,22 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PassRefPtr<DisplayRefreshMonitor> DisplayRefreshMonitor::create(DisplayRefreshMonitorClient* client)
</del><ins>+RefPtr<DisplayRefreshMonitor> DisplayRefreshMonitor::createDefaultDisplayRefreshMonitor(PlatformDisplayID displayID)
</ins><span class="cx"> {
</span><del>- PlatformDisplayID displayID = client->displayID();
-
- if (RefPtr<DisplayRefreshMonitor> monitor = client->createDisplayRefreshMonitor(displayID))
- return monitor.release();
-
</del><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> return DisplayRefreshMonitorMac::create(displayID);
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> return DisplayRefreshMonitorIOS::create(displayID);
</span><span class="cx"> #endif
</span><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+RefPtr<DisplayRefreshMonitor> DisplayRefreshMonitor::create(DisplayRefreshMonitorClient& client)
+{
+ return client.createDisplayRefreshMonitor(client.displayID());
+}
+
</ins><span class="cx"> DisplayRefreshMonitor::DisplayRefreshMonitor(PlatformDisplayID displayID)
</span><span class="cx"> : m_monotonicAnimationStartTime(0)
</span><span class="cx"> , m_active(true)
</span><span class="lines">@@ -71,16 +72,16 @@
</span><span class="cx"> monitor->displayDidRefresh();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DisplayRefreshMonitor::addClient(DisplayRefreshMonitorClient* client)
</del><ins>+void DisplayRefreshMonitor::addClient(DisplayRefreshMonitorClient& client)
</ins><span class="cx"> {
</span><del>- m_clients.add(client);
</del><ins>+ m_clients.add(&client);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool DisplayRefreshMonitor::removeClient(DisplayRefreshMonitorClient* client)
</del><ins>+bool DisplayRefreshMonitor::removeClient(DisplayRefreshMonitorClient& client)
</ins><span class="cx"> {
</span><span class="cx"> if (m_clientsToBeNotified)
</span><del>- m_clientsToBeNotified->remove(client);
- return m_clients.remove(client);
</del><ins>+ m_clientsToBeNotified->remove(&client);
+ return m_clients.remove(&client);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DisplayRefreshMonitor::displayDidRefresh()
</span><span class="lines">@@ -124,7 +125,7 @@
</span><span class="cx"> m_previousFrameDone = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- DisplayRefreshMonitorManager::sharedManager().displayDidRefresh(this);
</del><ins>+ DisplayRefreshMonitorManager::sharedManager().displayDidRefresh(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebCoreplatformgraphicsDisplayRefreshMonitorh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> class DisplayRefreshMonitor : public RefCounted<DisplayRefreshMonitor> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<DisplayRefreshMonitor> create(DisplayRefreshMonitorClient*);
</del><ins>+ static RefPtr<DisplayRefreshMonitor> create(DisplayRefreshMonitorClient&);
</ins><span class="cx"> virtual ~DisplayRefreshMonitor();
</span><span class="cx">
</span><span class="cx"> // Return true if callback request was scheduled, false if it couldn't be
</span><span class="lines">@@ -50,8 +50,8 @@
</span><span class="cx"> void windowScreenDidChange(PlatformDisplayID);
</span><span class="cx">
</span><span class="cx"> bool hasClients() const { return m_clients.size(); }
</span><del>- void addClient(DisplayRefreshMonitorClient*);
- bool removeClient(DisplayRefreshMonitorClient*);
</del><ins>+ void addClient(DisplayRefreshMonitorClient&);
+ bool removeClient(DisplayRefreshMonitorClient&);
</ins><span class="cx">
</span><span class="cx"> PlatformDisplayID displayID() const { return m_displayID; }
</span><span class="cx">
</span><span class="lines">@@ -74,6 +74,8 @@
</span><span class="cx">
</span><span class="cx"> Mutex& mutex() { return m_mutex; }
</span><span class="cx">
</span><ins>+ static RefPtr<DisplayRefreshMonitor> createDefaultDisplayRefreshMonitor(PlatformDisplayID);
+
</ins><span class="cx"> protected:
</span><span class="cx"> explicit DisplayRefreshMonitor(PlatformDisplayID);
</span><span class="cx"> static void handleDisplayRefreshedNotificationOnMainThread(void* data);
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebCoreplatformgraphicsDisplayRefreshMonitorClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitorClient.cpp (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitorClient.cpp 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitorClient.cpp 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> DisplayRefreshMonitorClient::~DisplayRefreshMonitorClient()
</span><span class="cx"> {
</span><del>- DisplayRefreshMonitorManager::sharedManager().unregisterClient(this);
</del><ins>+ DisplayRefreshMonitorManager::sharedManager().unregisterClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DisplayRefreshMonitorClient::fireDisplayRefreshIfNeeded(double timestamp)
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebCoreplatformgraphicsDisplayRefreshMonitorClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitorClient.h (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitorClient.h 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitorClient.h 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> // Always called on the main thread.
</span><span class="cx"> virtual void displayRefreshFired(double timestamp) = 0;
</span><span class="cx">
</span><del>- virtual PassRefPtr<DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const = 0;
</del><ins>+ virtual RefPtr<DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const = 0;
</ins><span class="cx">
</span><span class="cx"> PlatformDisplayID displayID() const { return m_displayID; }
</span><span class="cx"> bool hasDisplayID() const { return m_displayIDIsSet; }
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebCoreplatformgraphicsDisplayRefreshMonitorManagercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitorManager.cpp (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitorManager.cpp 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitorManager.cpp 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -44,9 +44,9 @@
</span><span class="cx"> return manager.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DisplayRefreshMonitor* DisplayRefreshMonitorManager::ensureMonitorForClient(DisplayRefreshMonitorClient* client)
</del><ins>+DisplayRefreshMonitor* DisplayRefreshMonitorManager::createMonitorForClient(DisplayRefreshMonitorClient& client)
</ins><span class="cx"> {
</span><del>- PlatformDisplayID clientDisplayID = client->displayID();
</del><ins>+ PlatformDisplayID clientDisplayID = client.displayID();
</ins><span class="cx"> for (const RefPtr<DisplayRefreshMonitor>& monitor : m_monitors) {
</span><span class="cx"> if (monitor->displayID() != clientDisplayID)
</span><span class="cx"> continue;
</span><span class="lines">@@ -55,26 +55,29 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<DisplayRefreshMonitor> monitor = DisplayRefreshMonitor::create(client);
</span><ins>+ if (!monitor)
+ return nullptr;
+
</ins><span class="cx"> monitor->addClient(client);
</span><span class="cx"> DisplayRefreshMonitor* result = monitor.get();
</span><span class="cx"> m_monitors.append(monitor.release());
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DisplayRefreshMonitorManager::registerClient(DisplayRefreshMonitorClient* client)
</del><ins>+void DisplayRefreshMonitorManager::registerClient(DisplayRefreshMonitorClient& client)
</ins><span class="cx"> {
</span><del>- if (!client->hasDisplayID())
</del><ins>+ if (!client.hasDisplayID())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- ensureMonitorForClient(client);
</del><ins>+ createMonitorForClient(client);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void DisplayRefreshMonitorManager::unregisterClient(DisplayRefreshMonitorClient* client)
</del><ins>+void DisplayRefreshMonitorManager::unregisterClient(DisplayRefreshMonitorClient& client)
</ins><span class="cx"> {
</span><del>- if (!client->hasDisplayID())
</del><ins>+ if (!client.hasDisplayID())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- PlatformDisplayID clientDisplayID = client->displayID();
</del><ins>+ PlatformDisplayID clientDisplayID = client.displayID();
</ins><span class="cx"> for (size_t i = 0; i < m_monitors.size(); ++i) {
</span><span class="cx"> RefPtr<DisplayRefreshMonitor> monitor = m_monitors[i];
</span><span class="cx"> if (monitor->displayID() != clientDisplayID)
</span><span class="lines">@@ -87,36 +90,38 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool DisplayRefreshMonitorManager::scheduleAnimation(DisplayRefreshMonitorClient* client)
</del><ins>+bool DisplayRefreshMonitorManager::scheduleAnimation(DisplayRefreshMonitorClient& client)
</ins><span class="cx"> {
</span><del>- if (!client->hasDisplayID())
</del><ins>+ if (!client.hasDisplayID())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- DisplayRefreshMonitor* monitor = ensureMonitorForClient(client);
</del><ins>+ DisplayRefreshMonitor* monitor = createMonitorForClient(client);
+ if (!monitor)
+ return false;
</ins><span class="cx">
</span><del>- client->setIsScheduled(true);
</del><ins>+ client.setIsScheduled(true);
</ins><span class="cx"> return monitor->requestRefreshCallback();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DisplayRefreshMonitorManager::displayDidRefresh(DisplayRefreshMonitor* monitor)
</del><ins>+void DisplayRefreshMonitorManager::displayDidRefresh(DisplayRefreshMonitor& monitor)
</ins><span class="cx"> {
</span><del>- if (!monitor->shouldBeTerminated())
</del><ins>+ if (!monitor.shouldBeTerminated())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- size_t monitorIndex = m_monitors.find(monitor);
</del><ins>+ size_t monitorIndex = m_monitors.find(&monitor);
</ins><span class="cx"> ASSERT(monitorIndex != notFound);
</span><span class="cx"> m_monitors.remove(monitorIndex);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DisplayRefreshMonitorManager::windowScreenDidChange(PlatformDisplayID displayID, DisplayRefreshMonitorClient* client)
</del><ins>+void DisplayRefreshMonitorManager::windowScreenDidChange(PlatformDisplayID displayID, DisplayRefreshMonitorClient& client)
</ins><span class="cx"> {
</span><del>- if (client->hasDisplayID() && client->displayID() == displayID)
</del><ins>+ if (client.hasDisplayID() && client.displayID() == displayID)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> unregisterClient(client);
</span><del>- client->setDisplayID(displayID);
</del><ins>+ client.setDisplayID(displayID);
</ins><span class="cx"> registerClient(client);
</span><del>- if (client->isScheduled())
</del><ins>+ if (client.isScheduled())
</ins><span class="cx"> scheduleAnimation(client);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebCoreplatformgraphicsDisplayRefreshMonitorManagerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitorManager.h (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitorManager.h 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/DisplayRefreshMonitorManager.h 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -41,20 +41,20 @@
</span><span class="cx"> public:
</span><span class="cx"> static DisplayRefreshMonitorManager& sharedManager();
</span><span class="cx">
</span><del>- void registerClient(DisplayRefreshMonitorClient*);
- void unregisterClient(DisplayRefreshMonitorClient*);
</del><ins>+ void registerClient(DisplayRefreshMonitorClient&);
+ void unregisterClient(DisplayRefreshMonitorClient&);
</ins><span class="cx">
</span><del>- bool scheduleAnimation(DisplayRefreshMonitorClient*);
- void windowScreenDidChange(PlatformDisplayID, DisplayRefreshMonitorClient*);
</del><ins>+ bool scheduleAnimation(DisplayRefreshMonitorClient&);
+ void windowScreenDidChange(PlatformDisplayID, DisplayRefreshMonitorClient&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class DisplayRefreshMonitor;
</span><del>- void displayDidRefresh(DisplayRefreshMonitor*);
</del><ins>+ void displayDidRefresh(DisplayRefreshMonitor&);
</ins><span class="cx">
</span><span class="cx"> DisplayRefreshMonitorManager() { }
</span><span class="cx"> virtual ~DisplayRefreshMonitorManager();
</span><span class="cx">
</span><del>- DisplayRefreshMonitor* ensureMonitorForClient(DisplayRefreshMonitorClient*);
</del><ins>+ DisplayRefreshMonitor* createMonitorForClient(DisplayRefreshMonitorClient&);
</ins><span class="cx">
</span><span class="cx"> Vector<RefPtr<DisplayRefreshMonitor>> m_monitors;
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebCoreplatformgraphicsGraphicsLayerUpdatercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/GraphicsLayerUpdater.cpp (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/GraphicsLayerUpdater.cpp 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/GraphicsLayerUpdater.cpp 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -31,14 +31,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-GraphicsLayerUpdater::GraphicsLayerUpdater(GraphicsLayerUpdaterClient* client, PlatformDisplayID displayID)
</del><ins>+GraphicsLayerUpdater::GraphicsLayerUpdater(GraphicsLayerUpdaterClient& client, PlatformDisplayID displayID)
</ins><span class="cx"> : m_client(client)
</span><del>- , m_scheduled(false)
</del><span class="cx"> {
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><del>- DisplayRefreshMonitorManager::sharedManager().registerClient(this);
- DisplayRefreshMonitorManager::sharedManager().windowScreenDidChange(displayID, this);
- DisplayRefreshMonitorManager::sharedManager().scheduleAnimation(this);
</del><ins>+ DisplayRefreshMonitorManager::sharedManager().registerClient(*this);
+ DisplayRefreshMonitorManager::sharedManager().windowScreenDidChange(displayID, *this);
+ DisplayRefreshMonitorManager::sharedManager().scheduleAnimation(*this);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(displayID);
</span><span class="cx"> #endif
</span><span class="lines">@@ -55,7 +54,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><del>- DisplayRefreshMonitorManager::sharedManager().scheduleAnimation(this);
</del><ins>+ DisplayRefreshMonitorManager::sharedManager().scheduleAnimation(*this);
</ins><span class="cx"> #endif
</span><span class="cx"> m_scheduled = true;
</span><span class="cx"> }
</span><span class="lines">@@ -63,7 +62,7 @@
</span><span class="cx"> void GraphicsLayerUpdater::screenDidChange(PlatformDisplayID displayID)
</span><span class="cx"> {
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><del>- DisplayRefreshMonitorManager::sharedManager().windowScreenDidChange(displayID, this);
</del><ins>+ DisplayRefreshMonitorManager::sharedManager().windowScreenDidChange(displayID, *this);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(displayID);
</span><span class="cx"> #endif
</span><span class="lines">@@ -74,14 +73,13 @@
</span><span class="cx"> UNUSED_PARAM(timestamp);
</span><span class="cx"> m_scheduled = false;
</span><span class="cx">
</span><del>- if (m_client)
- m_client->flushLayersSoon(this);
</del><ins>+ m_client.flushLayersSoon(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><del>-PassRefPtr<DisplayRefreshMonitor> GraphicsLayerUpdater::createDisplayRefreshMonitor(PlatformDisplayID displayID) const
</del><ins>+RefPtr<DisplayRefreshMonitor> GraphicsLayerUpdater::createDisplayRefreshMonitor(PlatformDisplayID displayID) const
</ins><span class="cx"> {
</span><del>- return m_client ? m_client->createDisplayRefreshMonitor(displayID) : nullptr;
</del><ins>+ return m_client.createDisplayRefreshMonitor(displayID);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebCoreplatformgraphicsGraphicsLayerUpdaterh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/GraphicsLayerUpdater.h (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/GraphicsLayerUpdater.h 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/GraphicsLayerUpdater.h 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -36,9 +36,9 @@
</span><span class="cx"> class GraphicsLayerUpdaterClient {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~GraphicsLayerUpdaterClient() { }
</span><del>- virtual void flushLayersSoon(GraphicsLayerUpdater*) = 0;
</del><ins>+ virtual void flushLayersSoon(GraphicsLayerUpdater&) = 0;
</ins><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><del>- virtual PassRefPtr<DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const = 0;
</del><ins>+ virtual RefPtr<DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const = 0;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -48,21 +48,21 @@
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> public:
</span><del>- GraphicsLayerUpdater(GraphicsLayerUpdaterClient*, PlatformDisplayID);
</del><ins>+ GraphicsLayerUpdater(GraphicsLayerUpdaterClient&, PlatformDisplayID);
</ins><span class="cx"> virtual ~GraphicsLayerUpdater();
</span><span class="cx">
</span><span class="cx"> void scheduleUpdate();
</span><span class="cx"> void screenDidChange(PlatformDisplayID);
</span><span class="cx">
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><del>- virtual PassRefPtr<DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const override;
</del><ins>+ virtual RefPtr<DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual void displayRefreshFired(double timestamp);
</span><span class="cx">
</span><del>- GraphicsLayerUpdaterClient* m_client;
- bool m_scheduled;
</del><ins>+ GraphicsLayerUpdaterClient& m_client;
+ bool m_scheduled { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -265,7 +265,6 @@
</span><span class="cx"> , m_updateCompositingLayersTimer(this, &RenderLayerCompositor::updateCompositingLayersTimerFired)
</span><span class="cx"> , m_hasAcceleratedCompositing(true)
</span><span class="cx"> , m_compositingTriggers(static_cast<ChromeClient::CompositingTriggerFlags>(ChromeClient::AllTriggers))
</span><del>- , m_compositedLayerCount(0)
</del><span class="cx"> , m_showDebugBorders(false)
</span><span class="cx"> , m_showRepaintCounter(false)
</span><span class="cx"> , m_acceleratedDrawingEnabled(false)
</span><span class="lines">@@ -278,20 +277,12 @@
</span><span class="cx"> , m_inPostLayoutUpdate(false)
</span><span class="cx"> , m_subframeScrollLayersNeedReattach(false)
</span><span class="cx"> , m_isTrackingRepaints(false)
</span><del>- , m_layersWithTiledBackingCount(0)
</del><span class="cx"> , m_rootLayerAttachment(RootLayerUnattached)
</span><span class="cx"> , m_layerFlushTimer(this, &RenderLayerCompositor::layerFlushTimerFired)
</span><span class="cx"> , m_layerFlushThrottlingEnabled(false)
</span><span class="cx"> , m_layerFlushThrottlingTemporarilyDisabledForInteraction(false)
</span><span class="cx"> , m_hasPendingLayerFlush(false)
</span><span class="cx"> , m_paintRelatedMilestonesTimer(this, &RenderLayerCompositor::paintRelatedMilestonesTimerFired)
</span><del>-#if !LOG_DISABLED
- , m_rootLayerUpdateCount(0)
- , m_obligateCompositedLayerCount(0)
- , m_secondaryCompositedLayerCount(0)
- , m_obligatoryBackingStoreBytes(0)
- , m_secondaryBackingStoreBytes(0)
-#endif
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -476,6 +467,7 @@
</span><span class="cx"> client->didFlushCompositingLayers();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ ++m_layerFlushCount;
</ins><span class="cx"> startLayerFlushTimerIfNeeded();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -593,13 +585,13 @@
</span><span class="cx"> if (Page* page = this->page())
</span><span class="cx"> displayID = page->chrome().displayID();
</span><span class="cx">
</span><del>- m_layerUpdater = std::make_unique<GraphicsLayerUpdater>(this, displayID);
</del><ins>+ m_layerUpdater = std::make_unique<GraphicsLayerUpdater>(*this, displayID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_layerUpdater->scheduleUpdate();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayerCompositor::flushLayersSoon(GraphicsLayerUpdater*)
</del><ins>+void RenderLayerCompositor::flushLayersSoon(GraphicsLayerUpdater&)
</ins><span class="cx"> {
</span><span class="cx"> scheduleLayerFlush(true);
</span><span class="cx"> }
</span><span class="lines">@@ -4073,15 +4065,28 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><del>-PassRefPtr<DisplayRefreshMonitor> RenderLayerCompositor::createDisplayRefreshMonitor(PlatformDisplayID displayID) const
</del><ins>+RefPtr<DisplayRefreshMonitor> RenderLayerCompositor::createDisplayRefreshMonitor(PlatformDisplayID displayID) const
</ins><span class="cx"> {
</span><span class="cx"> Frame& frame = m_renderView.frameView().frame();
</span><span class="cx"> Page* page = frame.page();
</span><span class="cx"> if (!page)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return page->chrome().client().createDisplayRefreshMonitor(displayID);
</del><ins>+ if (auto monitor = page->chrome().client().createDisplayRefreshMonitor(displayID))
+ return monitor;
+
+ return DisplayRefreshMonitor::createDefaultDisplayRefreshMonitor(displayID);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+void RenderLayerCompositor::startTrackingLayerFlushes()
+{
+ m_layerFlushCount = 0;
+}
+
+unsigned RenderLayerCompositor::layerFlushCount() const
+{
+ return m_layerFlushCount;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/rendering/RenderLayerCompositor.h (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/rendering/RenderLayerCompositor.h 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/rendering/RenderLayerCompositor.h 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -303,6 +303,10 @@
</span><span class="cx"> void setRootExtendedBackgroundColor(const Color&);
</span><span class="cx"> Color rootExtendedBackgroundColor() const { return m_rootExtendedBackgroundColor; }
</span><span class="cx">
</span><ins>+ // For testing.
+ void startTrackingLayerFlushes();
+ unsigned layerFlushCount() const;
+
</ins><span class="cx"> private:
</span><span class="cx"> class OverlapMap;
</span><span class="cx">
</span><span class="lines">@@ -314,7 +318,7 @@
</span><span class="cx"> virtual bool isTrackingRepaints() const override;
</span><span class="cx">
</span><span class="cx"> // GraphicsLayerUpdaterClient implementation
</span><del>- virtual void flushLayersSoon(GraphicsLayerUpdater*) override;
</del><ins>+ virtual void flushLayersSoon(GraphicsLayerUpdater&) override;
</ins><span class="cx">
</span><span class="cx"> // Whether the given RL needs a compositing layer.
</span><span class="cx"> bool needsToBeComposited(const RenderLayer&, RenderLayer::ViewportConstrainedNotCompositedReason* = 0) const;
</span><span class="lines">@@ -392,7 +396,7 @@
</span><span class="cx"> ScrollingCoordinator* scrollingCoordinator() const;
</span><span class="cx">
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><del>- PassRefPtr<DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const;
</del><ins>+ RefPtr<DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool requiresCompositingForAnimation(RenderLayerModelObject&) const;
</span><span class="lines">@@ -472,7 +476,6 @@
</span><span class="cx"> bool m_hasAcceleratedCompositing;
</span><span class="cx"> ChromeClient::CompositingTriggerFlags m_compositingTriggers;
</span><span class="cx">
</span><del>- int m_compositedLayerCount;
</del><span class="cx"> bool m_showDebugBorders;
</span><span class="cx"> bool m_showRepaintCounter;
</span><span class="cx"> bool m_acceleratedDrawingEnabled;
</span><span class="lines">@@ -491,7 +494,9 @@
</span><span class="cx">
</span><span class="cx"> bool m_isTrackingRepaints; // Used for testing.
</span><span class="cx">
</span><del>- unsigned m_layersWithTiledBackingCount;
</del><ins>+ int m_compositedLayerCount { 0 };
+ unsigned m_layersWithTiledBackingCount { 0 };
+ unsigned m_layerFlushCount { 0 };
</ins><span class="cx">
</span><span class="cx"> RootLayerAttachment m_rootLayerAttachment;
</span><span class="cx">
</span><span class="lines">@@ -532,11 +537,11 @@
</span><span class="cx"> Timer<RenderLayerCompositor> m_paintRelatedMilestonesTimer;
</span><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><del>- int m_rootLayerUpdateCount;
- int m_obligateCompositedLayerCount; // count of layer that have to be composited.
- int m_secondaryCompositedLayerCount; // count of layers that have to be composited because of stacking or overlap.
- double m_obligatoryBackingStoreBytes;
- double m_secondaryBackingStoreBytes;
</del><ins>+ int m_rootLayerUpdateCount { 0 };
+ int m_obligateCompositedLayerCount { 0 }; // count of layer that have to be composited.
+ int m_secondaryCompositedLayerCount { 0 }; // count of layers that have to be composited because of stacking or overlap.
+ double m_obligatoryBackingStoreBytes { 0 };
+ double m_secondaryBackingStoreBytes { 0 };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> Color m_rootExtendedBackgroundColor;
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/testing/Internals.cpp (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/testing/Internals.cpp 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/testing/Internals.cpp 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -81,6 +81,7 @@
</span><span class="cx"> #include "PseudoElement.h"
</span><span class="cx"> #include "Range.h"
</span><span class="cx"> #include "RenderEmbeddedObject.h"
</span><ins>+#include "RenderLayerCompositor.h"
</ins><span class="cx"> #include "RenderMenuList.h"
</span><span class="cx"> #include "RenderTreeAsText.h"
</span><span class="cx"> #include "RenderView.h"
</span><span class="lines">@@ -1944,6 +1945,28 @@
</span><span class="cx"> frameView->setTracksRepaints(false);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Internals::startTrackingLayerFlushes(ExceptionCode& ec)
+{
+ Document* document = contextDocument();
+ if (!document || !document->renderView()) {
+ ec = INVALID_ACCESS_ERR;
+ return;
+ }
+
+ document->renderView()->compositor().startTrackingLayerFlushes();
+}
+
+unsigned long Internals::layerFlushCount(ExceptionCode& ec)
+{
+ Document* document = contextDocument();
+ if (!document || !document->renderView()) {
+ ec = INVALID_ACCESS_ERR;
+ return 0;
+ }
+
+ return document->renderView()->compositor().layerFlushCount();
+}
+
</ins><span class="cx"> void Internals::updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(nullptr, ec);
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/testing/Internals.h (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/testing/Internals.h 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/testing/Internals.h 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -279,6 +279,10 @@
</span><span class="cx">
</span><span class="cx"> void startTrackingRepaints(ExceptionCode&);
</span><span class="cx"> void stopTrackingRepaints(ExceptionCode&);
</span><ins>+
+ void startTrackingLayerFlushes(ExceptionCode&);
+ unsigned long layerFlushCount(ExceptionCode&);
+
</ins><span class="cx"> void updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(ExceptionCode&);
</span><span class="cx"> void updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(Node*, ExceptionCode&);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/testing/Internals.idl (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/testing/Internals.idl 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/testing/Internals.idl 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -241,6 +241,9 @@
</span><span class="cx"> [RaisesException] void startTrackingRepaints();
</span><span class="cx"> [RaisesException] void stopTrackingRepaints();
</span><span class="cx">
</span><ins>+ [RaisesException] void startTrackingLayerFlushes();
+ [RaisesException] unsigned long layerFlushCount();
+
</ins><span class="cx"> // |node| should be Document, HTMLIFrameElement, or unspecified.
</span><span class="cx"> // If |node| is an HTMLIFrameElement, it assumes node.contentDocument is
</span><span class="cx"> // specified without security checks. Unspecified means this document.
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebKit2/ChangeLog (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebKit2/ChangeLog 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebKit2/ChangeLog 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -1,19 +1,54 @@
</span><del>-2015-03-16 Babak Shafiei <bshafiei@apple.com>
</del><ins>+2015-04-20 Lucas Forschler <lforschler@apple.com>
</ins><span class="cx">
</span><del>- Merge patch for rdar://problem/20155503.
</del><ins>+ Merge r181656 & r182985.
</ins><span class="cx">
</span><del>- 2015-03-13 Enrica Casucci <enrica@apple.com>
</del><ins>+ 2015-04-18 Simon Fraser <simon.fraser@apple.com>
</ins><span class="cx">
</span><del>- Webkit crash in WebKit::nextFocusableElement() when typing TAB on external keyboard
- rdar://problem/20155503
</del><ins>+ REGRESSION (r181656): Animated tiled layers are missing content
+ https://bugs.webkit.org/show_bug.cgi?id=143911
+ rdar://problem/20596328
</ins><span class="cx">
</span><del>- Reviewed by David Kilzer.
</del><ins>+ Reviewed by Darin Adler.
+
+ After r181656, all requestAnimationFrame was falling back to timers, and not
+ using the platform's DisplayRefreshMonitor, because of a Nullopt vs nullptr
+ fumble.
+
+ Replace this confusing Optional<> code with simpler code that just forces the
+ clients to make a DisplayRefreshMonitor if they can, first asking
+ ChromeClient, and then falling back to createDefaultDisplayRefreshMonitor().
+
+ Make lots of things into references, and use C++11 initialization in some places.
</ins><span class="cx">
</span><del>- Adding null check!
</del><ins>+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::createDisplayRefreshMonitor):
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
</ins><span class="cx">
</span><del>- * WebProcess/WebPage/ios/WebPageIOS.mm:
- (WebKit::nextFocusableElement):
</del><ins>+ 2015-03-17 Timothy Horton <timothy_horton@apple.com>
</ins><span class="cx">
</span><ins>+ Reproducible null deref under ScriptedAnimationController::createDisplayRefreshMonitor
+ https://bugs.webkit.org/show_bug.cgi?id=142776
+ <rdar://problem/18921338>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::createDisplayRefreshMonitor):
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ Adjust to the new signature.
+
+2015-03-13 Enrica Casucci <enrica@apple.com>
+
+ Webkit crash in WebKit::nextFocusableElement() when typing TAB on external keyboard
+ rdar://problem/20155503
+
+ Reviewed by David Kilzer.
+
+ Adding null check!
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::nextFocusableElement):
+
</ins><span class="cx"> 2015-03-12 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r181448.
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -810,7 +810,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><del>-PassRefPtr<WebCore::DisplayRefreshMonitor> WebChromeClient::createDisplayRefreshMonitor(PlatformDisplayID displayID) const
</del><ins>+RefPtr<WebCore::DisplayRefreshMonitor> WebChromeClient::createDisplayRefreshMonitor(PlatformDisplayID displayID) const
</ins><span class="cx"> {
</span><span class="cx"> return m_page->drawingArea()->createDisplayRefreshMonitor(displayID);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> virtual WebCore::GraphicsLayer* documentOverlayLayerForFrame(WebCore::Frame&) override;
</span><span class="cx">
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><del>- virtual PassRefPtr<WebCore::DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const override;
</del><ins>+ virtual RefPtr<WebCore::DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual CompositingTriggerFlags allowedCompositingTriggers() const
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebKit2WebProcessWebPageDrawingAreacpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><del>-PassRefPtr<WebCore::DisplayRefreshMonitor> DrawingArea::createDisplayRefreshMonitor(PlatformDisplayID)
</del><ins>+RefPtr<WebCore::DisplayRefreshMonitor> DrawingArea::createDisplayRefreshMonitor(PlatformDisplayID)
</ins><span class="cx"> {
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebKit2WebProcessWebPageDrawingAreah"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> virtual void scheduleCompositingLayerFlushImmediately() = 0;
</span><span class="cx">
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><del>- virtual PassRefPtr<WebCore::DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID);
</del><ins>+ virtual RefPtr<WebCore::DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual WebCore::TransformationMatrix rootLayerTransform() const;
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void addTransactionCallbackID(uint64_t callbackID) override;
</span><span class="cx">
</span><del>- virtual PassRefPtr<WebCore::DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) override;
</del><ins>+ virtual RefPtr<WebCore::DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) override;
</ins><span class="cx"> void willDestroyDisplayRefreshMonitor(WebCore::DisplayRefreshMonitor*);
</span><span class="cx">
</span><span class="cx"> virtual bool shouldUseTiledBackingForFrameView(const WebCore::FrameView*) override;
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (183036 => 183037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2015-04-20 23:38:42 UTC (rev 183036)
+++ branches/safari-600.1.4.16-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2015-04-21 00:17:23 UTC (rev 183037)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> return m_remoteLayerTreeContext.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<DisplayRefreshMonitor> RemoteLayerTreeDrawingArea::createDisplayRefreshMonitor(PlatformDisplayID displayID)
</del><ins>+RefPtr<DisplayRefreshMonitor> RemoteLayerTreeDrawingArea::createDisplayRefreshMonitor(PlatformDisplayID displayID)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<RemoteLayerTreeDisplayRefreshMonitor> monitor = RemoteLayerTreeDisplayRefreshMonitor::create(displayID, *this);
</span><span class="cx"> m_displayRefreshMonitors.add(monitor.get());
</span></span></pre>
</div>
</div>
</body>
</html>