<!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>[161151] 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/161151">161151</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2013-12-30 13:05:50 -0800 (Mon, 30 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Document should store its RenderView in a RenderPtr.
<https://webkit.org/b/126299>
Make Document::m_renderView a RenderPtr<RenderView> and remove one
manual destroy() call. Also removed the setRenderView() helper and
inlined it at the two call sites.
Reviewed by Antti Koivisto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161150 => 161151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-12-30 20:54:32 UTC (rev 161150)
+++ trunk/Source/WebCore/ChangeLog        2013-12-30 21:05:50 UTC (rev 161151)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-12-30 Andreas Kling <akling@apple.com>
+
+ Document should store its RenderView in a RenderPtr.
+ <https://webkit.org/b/126299>
+
+ Make Document::m_renderView a RenderPtr<RenderView> and remove one
+ manual destroy() call. Also removed the setRenderView() helper and
+ inlined it at the two call sites.
+
+ Reviewed by Antti Koivisto.
+
</ins><span class="cx"> 2013-12-30 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CMake] [GTK] Add support for GObject introspection
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (161150 => 161151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp        2013-12-30 20:54:32 UTC (rev 161150)
+++ trunk/Source/WebCore/dom/Document.cpp        2013-12-30 21:05:50 UTC (rev 161151)
</span><span class="lines">@@ -457,7 +457,6 @@
</span><span class="cx"> , m_isViewSource(false)
</span><span class="cx"> , m_sawElementsInKnownNamespaces(false)
</span><span class="cx"> , m_isSrcdocDocument(false)
</span><del>- , m_renderView(nullptr)
</del><span class="cx"> , m_eventQueue(*this)
</span><span class="cx"> , m_weakFactory(this)
</span><span class="cx"> , m_idAttributeName(idAttr)
</span><span class="lines">@@ -1945,12 +1944,6 @@
</span><span class="cx"> m_styleResolver.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::setRenderView(RenderView* renderView)
-{
- m_renderView = renderView;
- Node::setRenderer(renderView);
-}
-
</del><span class="cx"> void Document::createRenderTree()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!renderView());
</span><span class="lines">@@ -1958,7 +1951,9 @@
</span><span class="cx"> ASSERT(!m_axObjectCache || this != topDocument());
</span><span class="cx">
</span><span class="cx"> // FIXME: It would be better if we could pass the resolved document style directly here.
</span><del>- setRenderView(new RenderView(*this, RenderStyle::create()));
</del><ins>+ m_renderView = createRenderObject<RenderView>(*this, RenderStyle::create());
+ Node::setRenderer(m_renderView.get());
+
</ins><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span><span class="cx"> renderView()->setIsInWindow(true);
</span><span class="cx"> #endif
</span><span class="lines">@@ -2062,9 +2057,8 @@
</span><span class="cx">
</span><span class="cx"> unscheduleStyleRecalc();
</span><span class="cx">
</span><del>- if (renderView())
- renderView()->destroy();
- setRenderView(nullptr);
</del><ins>+ m_renderView = nullptr;
+ Node::setRenderer(nullptr);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> // Do this before the arena is cleared, which is needed to deref the RenderStyle on TextAutoSizingKey.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (161150 => 161151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h        2013-12-30 20:54:32 UTC (rev 161150)
+++ trunk/Source/WebCore/dom/Document.h        2013-12-30 21:05:50 UTC (rev 161151)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include "PlatformScreen.h"
</span><span class="cx"> #include "QualifiedName.h"
</span><span class="cx"> #include "ReferrerPolicy.h"
</span><ins>+#include "RenderPtr.h"
</ins><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "StringWithDirection.h"
</span><span class="cx"> #include "StyleResolveTree.h"
</span><span class="lines">@@ -565,7 +566,7 @@
</span><span class="cx"> virtual void resumeActiveDOMObjects(ActiveDOMObject::ReasonForSuspension) OVERRIDE;
</span><span class="cx"> virtual void stopActiveDOMObjects() OVERRIDE;
</span><span class="cx">
</span><del>- RenderView* renderView() const { return m_renderView; }
</del><ins>+ RenderView* renderView() const { return m_renderView.get(); }
</ins><span class="cx">
</span><span class="cx"> bool renderTreeBeingDestroyed() const { return m_renderTreeBeingDestroyed; }
</span><span class="cx"> bool hasLivingRenderTree() const { return renderView() && !renderTreeBeingDestroyed(); }
</span><span class="lines">@@ -1233,7 +1234,6 @@
</span><span class="cx">
</span><span class="cx"> RenderObject* renderer() const WTF_DELETED_FUNCTION;
</span><span class="cx"> void setRenderer(RenderObject*) WTF_DELETED_FUNCTION;
</span><del>- void setRenderView(RenderView*);
</del><span class="cx">
</span><span class="cx"> virtual void createRenderTree();
</span><span class="cx"> virtual void dropChildren() OVERRIDE;
</span><span class="lines">@@ -1502,7 +1502,7 @@
</span><span class="cx"> bool m_sawElementsInKnownNamespaces;
</span><span class="cx"> bool m_isSrcdocDocument;
</span><span class="cx">
</span><del>- RenderView* m_renderView;
</del><ins>+ RenderPtr<RenderView> m_renderView;
</ins><span class="cx"> mutable DocumentEventQueue m_eventQueue;
</span><span class="cx">
</span><span class="cx"> WeakPtrFactory<Document> m_weakFactory;
</span></span></pre>
</div>
</div>
</body>
</html>