<!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>[210330] trunk/Source/WebCore</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/210330">210330</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2017-01-05 08:17:22 -0800 (Thu, 05 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove some unnecessary page cache checks in render tree code.
<https://webkit.org/b/166728>
Reviewed by Antti Koivisto.
There is no render tree in the page cache, so we don't need to be checking
for it in renderer code.
* rendering/RenderElement.cpp:
(WebCore::shouldRepaintForImageAnimation):
(WebCore::RenderElement::newImageAnimationFrameAvailable):
* rendering/RenderImage.cpp:
(WebCore::RenderImage::imageChanged):
* rendering/RenderObject.cpp:
(WebCore::printRenderTreeForLiveDocuments):
(WebCore::printLayerTreeForLiveDocuments):
* rendering/RenderView.cpp:
(WebCore::RenderView::lazyRepaintTimerFired):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImagecpp">trunk/Source/WebCore/rendering/RenderImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210329 => 210330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-05 16:02:44 UTC (rev 210329)
+++ trunk/Source/WebCore/ChangeLog 2017-01-05 16:17:22 UTC (rev 210330)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2017-01-05 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><ins>+ Remove some unnecessary page cache checks in render tree code.
+ <https://webkit.org/b/166728>
+
+ Reviewed by Antti Koivisto.
+
+ There is no render tree in the page cache, so we don't need to be checking
+ for it in renderer code.
+
+ * rendering/RenderElement.cpp:
+ (WebCore::shouldRepaintForImageAnimation):
+ (WebCore::RenderElement::newImageAnimationFrameAvailable):
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::imageChanged):
+ * rendering/RenderObject.cpp:
+ (WebCore::printRenderTreeForLiveDocuments):
+ (WebCore::printLayerTreeForLiveDocuments):
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::lazyRepaintTimerFired):
+
+2017-01-05 Andreas Kling <akling@apple.com>
+
</ins><span class="cx"> REGRESSION(r210226): overflow:scroll scroll position not restored on back navigation
</span><span class="cx"> <https://webkit.org/b/166724>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (210329 => 210330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2017-01-05 16:02:44 UTC (rev 210329)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2017-01-05 16:17:22 UTC (rev 210330)
</span><span class="lines">@@ -1432,8 +1432,6 @@
</span><span class="cx"> static bool shouldRepaintForImageAnimation(const RenderElement& renderer, const IntRect& visibleRect)
</span><span class="cx"> {
</span><span class="cx"> const Document& document = renderer.document();
</span><del>- if (document.pageCacheState() != Document::NotInPageCache)
- return false;
</del><span class="cx"> if (document.activeDOMObjectsAreSuspended())
</span><span class="cx"> return false;
</span><span class="cx"> if (renderer.style().visibility() != VISIBLE)
</span><span class="lines">@@ -1491,8 +1489,6 @@
</span><span class="cx">
</span><span class="cx"> void RenderElement::newImageAnimationFrameAvailable(CachedImage& image)
</span><span class="cx"> {
</span><del>- if (document().pageCacheState() != Document::NotInPageCache)
- return;
</del><span class="cx"> auto& frameView = view().frameView();
</span><span class="cx"> auto visibleRect = frameView.windowToContents(frameView.windowClipRect());
</span><span class="cx"> if (!shouldRepaintForImageAnimation(*this, visibleRect)) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (210329 => 210330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImage.cpp 2017-01-05 16:02:44 UTC (rev 210329)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2017-01-05 16:17:22 UTC (rev 210330)
</span><span class="lines">@@ -230,10 +230,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderImage::imageChanged(WrappedImagePtr newImage, const IntRect* rect)
</span><span class="cx"> {
</span><del>- // FIXME (86669): Instead of the RenderImage determining whether its document is in the page
- // cache, the RenderImage should remove itself as a client when its document is put into the
- // page cache.
- if (documentBeingDestroyed() || document().pageCacheState() != Document::NotInPageCache)
</del><ins>+ if (documentBeingDestroyed())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (hasVisibleBoxDecorations() || hasMask() || hasShapeOutside())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (210329 => 210330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2017-01-05 16:02:44 UTC (rev 210329)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2017-01-05 16:17:22 UTC (rev 210330)
</span><span class="lines">@@ -2015,7 +2015,7 @@
</span><span class="cx"> void printRenderTreeForLiveDocuments()
</span><span class="cx"> {
</span><span class="cx"> for (const auto* document : Document::allDocuments()) {
</span><del>- if (!document->renderView() || document->pageCacheState() != Document::NotInPageCache)
</del><ins>+ if (!document->renderView())
</ins><span class="cx"> continue;
</span><span class="cx"> if (document->frame() && document->frame()->isMainFrame())
</span><span class="cx"> fprintf(stderr, "----------------------main frame--------------------------\n");
</span><span class="lines">@@ -2027,7 +2027,7 @@
</span><span class="cx"> void printLayerTreeForLiveDocuments()
</span><span class="cx"> {
</span><span class="cx"> for (const auto* document : Document::allDocuments()) {
</span><del>- if (!document->renderView() || document->pageCacheState() != Document::NotInPageCache)
</del><ins>+ if (!document->renderView())
</ins><span class="cx"> continue;
</span><span class="cx"> if (document->frame() && document->frame()->isMainFrame())
</span><span class="cx"> fprintf(stderr, "----------------------main frame--------------------------\n");
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (210329 => 210330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2017-01-05 16:02:44 UTC (rev 210329)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2017-01-05 16:17:22 UTC (rev 210330)
</span><span class="lines">@@ -168,11 +168,8 @@
</span><span class="cx">
</span><span class="cx"> void RenderView::lazyRepaintTimerFired()
</span><span class="cx"> {
</span><del>- bool shouldRepaint = document().pageCacheState() == Document::NotInPageCache;
-
</del><span class="cx"> for (auto& renderer : m_renderersNeedingLazyRepaint) {
</span><del>- if (shouldRepaint)
- renderer->repaint();
</del><ins>+ renderer->repaint();
</ins><span class="cx"> renderer->setRenderBoxNeedsLazyRepaint(false);
</span><span class="cx"> }
</span><span class="cx"> m_renderersNeedingLazyRepaint.clear();
</span></span></pre>
</div>
</div>
</body>
</html>