<!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>[189699] releases/WebKitGTK/webkit-2.10/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/189699">189699</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-14 02:08:34 -0700 (Mon, 14 Sep 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188821">r188821</a> - Page::renderTreeSize() does not include anonymous renderers.
https://bugs.webkit.org/show_bug.cgi?id=148352

Reviewed by Andreas Kling.

Anonymous renderes take the document as their node. Instead
of checking whether the node is the document, we could just check
if the RenderView is available.

* rendering/RenderObject.cpp:
(WebCore::RenderObject::RenderObject):
(WebCore::RenderObject::~RenderObject):
* rendering/RenderView.cpp:
(WebCore::RenderView::RenderView): Deleted.
* rendering/RenderView.h: Include the RenderView in render tree size as well.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderObjectcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderViewcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderViewh">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderView.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (189698 => 189699)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog        2015-09-14 09:04:00 UTC (rev 189698)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog        2015-09-14 09:08:34 UTC (rev 189699)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-08-22  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        Page::renderTreeSize() does not include anonymous renderers.
+        https://bugs.webkit.org/show_bug.cgi?id=148352
+
+        Reviewed by Andreas Kling.
+
+        Anonymous renderes take the document as their node. Instead
+        of checking whether the node is the document, we could just check
+        if the RenderView is available.
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::RenderObject):
+        (WebCore::RenderObject::~RenderObject):
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::RenderView): Deleted.
+        * rendering/RenderView.h: Include the RenderView in render tree size as well.
+
</ins><span class="cx"> 2015-08-31  Antti Koivisto  &lt;antti@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r188820): fast/dom/HTMLObjectElement/object-as-frame.html is flaky
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderObject.cpp (189698 => 189699)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderObject.cpp        2015-09-14 09:04:00 UTC (rev 189698)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderObject.cpp        2015-09-14 09:08:34 UTC (rev 189699)
</span><span class="lines">@@ -117,8 +117,8 @@
</span><span class="cx"> #endif
</span><span class="cx">     , m_bitfields(node)
</span><span class="cx"> {
</span><del>-    if (!node.isDocumentNode())
-        view().didCreateRenderer();
</del><ins>+    if (RenderView* renderView = node.document().renderView())
+        renderView-&gt;didCreateRenderer();
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     renderObjectCounter.increment();
</span><span class="cx"> #endif
</span><span class="lines">@@ -126,11 +126,11 @@
</span><span class="cx"> 
</span><span class="cx"> RenderObject::~RenderObject()
</span><span class="cx"> {
</span><ins>+    view().didDestroyRenderer();
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     ASSERT(!m_hasAXObject);
</span><span class="cx">     renderObjectCounter.decrement();
</span><span class="cx"> #endif
</span><del>-    view().didDestroyRenderer();
</del><span class="cx">     ASSERT(!hasRareData());
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderView.cpp (189698 => 189699)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderView.cpp        2015-09-14 09:04:00 UTC (rev 189698)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderView.cpp        2015-09-14 09:08:34 UTC (rev 189699)
</span><span class="lines">@@ -121,7 +121,6 @@
</span><span class="cx">     , m_selectionUnsplitEnd(nullptr)
</span><span class="cx">     , m_selectionUnsplitStartPos(-1)
</span><span class="cx">     , m_selectionUnsplitEndPos(-1)
</span><del>-    , m_rendererCount(0)
</del><span class="cx">     , m_maximalOutlineSize(0)
</span><span class="cx">     , m_lazyRepaintTimer(*this, &amp;RenderView::lazyRepaintTimerFired)
</span><span class="cx">     , m_pageLogicalHeight(0)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderView.h (189698 => 189699)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderView.h        2015-09-14 09:04:00 UTC (rev 189698)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderView.h        2015-09-14 09:08:34 UTC (rev 189699)
</span><span class="lines">@@ -323,7 +323,8 @@
</span><span class="cx">     int m_selectionUnsplitStartPos;
</span><span class="cx">     int m_selectionUnsplitEndPos;
</span><span class="cx"> 
</span><del>-    uint64_t m_rendererCount;
</del><ins>+    // Include this RenderView.
+    uint64_t m_rendererCount { 1 };
</ins><span class="cx"> 
</span><span class="cx">     mutable std::unique_ptr&lt;Region&gt; m_accumulatedRepaintRegion;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>