<!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>[161123] 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/161123">161123</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2013-12-29 12:57:32 -0800 (Sun, 29 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderLayer: Store reflection renderer in a RenderPtr.
<https://webkit.org/b/126273>
Reviewed by Anders Carlsson.
* rendering/RenderLayer.h:
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::RenderLayer):
(WebCore::RenderLayer::calculateClipRects):
Turn RenderLayer::m_reflection into a RenderPtr<RenderReplica>
instead of a raw pointer.
* WebCore.xcodeproj/project.pbxproj:
Add RenderPtr.h to private headers.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161122 => 161123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-29 18:51:26 UTC (rev 161122)
+++ trunk/Source/WebCore/ChangeLog 2013-12-29 20:57:32 UTC (rev 161123)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2013-12-29 Andreas Kling <akling@apple.com>
+
+ RenderLayer: Store reflection renderer in a RenderPtr.
+ <https://webkit.org/b/126273>
+
+ Reviewed by Anders Carlsson.
+
+ * rendering/RenderLayer.h:
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::RenderLayer):
+ (WebCore::RenderLayer::calculateClipRects):
+
+ Turn RenderLayer::m_reflection into a RenderPtr<RenderReplica>
+ instead of a raw pointer.
+
+ * WebCore.xcodeproj/project.pbxproj:
+
+ Add RenderPtr.h to private headers.
+
</ins><span class="cx"> 2013-12-28 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Add an owning smart pointer for RenderObjects and start using it.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (161122 => 161123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-12-29 18:51:26 UTC (rev 161122)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-12-29 20:57:32 UTC (rev 161123)
</span><span class="lines">@@ -4714,6 +4714,7 @@
</span><span class="cx"> B59ED23B18272679006D564C /* RenderAncestorIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = B59ED23A18272679006D564C /* RenderAncestorIterator.h */; };
</span><span class="cx"> B5A684220FFABE9800D24689 /* SQLiteFileSystem.h in Headers */ = {isa = PBXBuildFile; fileRef = B5A684210FFABE9800D24689 /* SQLiteFileSystem.h */; };
</span><span class="cx"> B5A684240FFABEAA00D24689 /* SQLiteFileSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5A684230FFABEAA00D24689 /* SQLiteFileSystem.cpp */; };
</span><ins>+ B5B65874186FDE4C009C26E8 /* RenderPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = ADE16736181050C300463A2E /* RenderPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> B5B7A17017C10AA800E4AA0A /* ElementData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5B7A16F17C1080600E4AA0A /* ElementData.cpp */; };
</span><span class="cx"> B5B7A17117C10AC000E4AA0A /* ElementData.h in Headers */ = {isa = PBXBuildFile; fileRef = B5B7A16E17C1048000E4AA0A /* ElementData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> B5D31DFA11CF610B009F22B4 /* ActiveDOMCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5D31DF811CF610B009F22B4 /* ActiveDOMCallback.cpp */; };
</span><span class="lines">@@ -23102,6 +23103,7 @@
</span><span class="cx"> FD31609312B026F700C1A359 /* EqualPowerPanner.h in Headers */,
</span><span class="cx"> 2ECF7AE210162B5800427DE7 /* ErrorEvent.h in Headers */,
</span><span class="cx"> 070363E4181A1CDC00C074A5 /* AVMediaCaptureSource.h in Headers */,
</span><ins>+ B5B65874186FDE4C009C26E8 /* RenderPtr.h in Headers */,
</ins><span class="cx"> 85031B420A44EFC700F992E0 /* Event.h in Headers */,
</span><span class="cx"> 4138D3351244054800323D33 /* EventContext.h in Headers */,
</span><span class="cx"> CDAB6D2917C7DE6C00C60B34 /* MediaControlsHost.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (161122 => 161123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-12-29 18:51:26 UTC (rev 161122)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-12-29 20:57:32 UTC (rev 161123)
</span><span class="lines">@@ -207,7 +207,6 @@
</span><span class="cx"> , m_last(0)
</span><span class="cx"> , m_staticInlinePosition(0)
</span><span class="cx"> , m_staticBlockPosition(0)
</span><del>- , m_reflection(0)
</del><span class="cx"> , m_scrollCorner(0)
</span><span class="cx"> , m_resizer(0)
</span><span class="cx"> , m_enclosingPaginationLayer(0)
</span><span class="lines">@@ -6734,7 +6733,7 @@
</span><span class="cx"> void RenderLayer::createReflection()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_reflection);
</span><del>- m_reflection = new RenderReplica(renderer().document(), createReflectionStyle());
</del><ins>+ m_reflection = createRenderObject<RenderReplica>(renderer().document(), createReflectionStyle());
</ins><span class="cx"> m_reflection->setParent(&renderer()); // We create a 1-way connection.
</span><span class="cx"> m_reflection->initializeStyle();
</span><span class="cx"> }
</span><span class="lines">@@ -6745,8 +6744,7 @@
</span><span class="cx"> m_reflection->removeLayers(this);
</span><span class="cx">
</span><span class="cx"> m_reflection->setParent(0);
</span><del>- m_reflection->destroy();
- m_reflection = 0;
</del><ins>+ m_reflection = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRef<RenderStyle> RenderLayer::createReflectionStyle()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (161122 => 161123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2013-12-29 18:51:26 UTC (rev 161122)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2013-12-29 20:57:32 UTC (rev 161123)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx">
</span><span class="cx"> #include "PaintInfo.h"
</span><span class="cx"> #include "RenderBox.h"
</span><ins>+#include "RenderPtr.h"
</ins><span class="cx"> #include "ScrollableArea.h"
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -365,7 +366,7 @@
</span><span class="cx">
</span><span class="cx"> bool hasReflection() const { return renderer().hasReflection(); }
</span><span class="cx"> bool isReflection() const { return renderer().isReplica(); }
</span><del>- RenderReplica* reflection() const { return m_reflection; }
</del><ins>+ RenderReplica* reflection() const { return m_reflection.get(); }
</ins><span class="cx"> RenderLayer* reflectionLayer() const;
</span><span class="cx">
</span><span class="cx"> const RenderLayer* root() const
</span><span class="lines">@@ -1315,7 +1316,7 @@
</span><span class="cx"> OwnPtr<TransformationMatrix> m_transform;
</span><span class="cx">
</span><span class="cx"> // May ultimately be extended to many replicas (with their own paint order).
</span><del>- RenderReplica* m_reflection;
</del><ins>+ RenderPtr<RenderReplica> m_reflection;
</ins><span class="cx">
</span><span class="cx"> // Renderers to hold our custom scroll corner and resizer.
</span><span class="cx"> RenderScrollbarPart* m_scrollCorner;
</span></span></pre>
</div>
</div>
</body>
</html>