<!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>[161153] 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/161153">161153</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2013-12-30 14:40:20 -0800 (Mon, 30 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename createRenderObject() to createRenderer().
Somewhat rubber-stamped 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="#trunkSourceWebCoredomPseudoElementcpp">trunk/Source/WebCore/dom/PseudoElement.cpp</a></li>
<li><a href="#trunkSourceWebCoredomTextcpp">trunk/Source/WebCore/dom/Text.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderPtrh">trunk/Source/WebCore/rendering/RenderPtr.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleContentDatacpp">trunk/Source/WebCore/rendering/style/ContentData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleContentDatah">trunk/Source/WebCore/rendering/style/ContentData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161152 => 161153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-30 21:43:44 UTC (rev 161152)
+++ trunk/Source/WebCore/ChangeLog 2013-12-30 22:40:20 UTC (rev 161153)
</span><span class="lines">@@ -1,5 +1,11 @@
</span><span class="cx"> 2013-12-30 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><ins>+ Rename createRenderObject() to createRenderer().
+
+ Somewhat rubber-stamped by Antti Koivisto.
+
+2013-12-30 Andreas Kling <akling@apple.com>
+
</ins><span class="cx"> Document should store its RenderView in a RenderPtr.
</span><span class="cx"> <https://webkit.org/b/126299>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (161152 => 161153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2013-12-30 21:43:44 UTC (rev 161152)
+++ trunk/Source/WebCore/dom/Document.cpp 2013-12-30 22:40:20 UTC (rev 161153)
</span><span class="lines">@@ -1951,7 +1951,7 @@
</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>- m_renderView = createRenderObject<RenderView>(*this, RenderStyle::create());
</del><ins>+ m_renderView = createRenderer<RenderView>(*this, RenderStyle::create());
</ins><span class="cx"> Node::setRenderer(m_renderView.get());
</span><span class="cx">
</span><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span></span></pre></div>
<a id="trunkSourceWebCoredomPseudoElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/PseudoElement.cpp (161152 => 161153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/PseudoElement.cpp 2013-12-30 21:43:44 UTC (rev 161152)
+++ trunk/Source/WebCore/dom/PseudoElement.cpp 2013-12-30 22:40:20 UTC (rev 161153)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> ASSERT(style.contentData());
</span><span class="cx">
</span><span class="cx"> for (const ContentData* content = style.contentData(); content; content = content->next()) {
</span><del>- RenderPtr<RenderObject> child = content->createRenderer(document(), style);
</del><ins>+ auto child = content->createContentRenderer(document(), style);
</ins><span class="cx"> if (renderer->isChildAllowed(*child, style)) {
</span><span class="cx"> auto* childPtr = child.get();
</span><span class="cx"> renderer->addChild(child.leakPtr());
</span></span></pre></div>
<a id="trunkSourceWebCoredomTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Text.cpp (161152 => 161153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Text.cpp 2013-12-30 21:43:44 UTC (rev 161152)
+++ trunk/Source/WebCore/dom/Text.cpp 2013-12-30 22:40:20 UTC (rev 161153)
</span><span class="lines">@@ -191,12 +191,12 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SVG)
</span><span class="cx"> if (isSVGText(this) || isSVGShadowText(this))
</span><del>- return createRenderObject<RenderSVGInlineText>(*this, dataImpl());
</del><ins>+ return createRenderer<RenderSVGInlineText>(*this, dataImpl());
</ins><span class="cx"> #endif
</span><span class="cx"> if (style.hasTextCombine())
</span><del>- return createRenderObject<RenderCombineText>(*this, dataImpl());
</del><ins>+ return createRenderer<RenderCombineText>(*this, dataImpl());
</ins><span class="cx">
</span><del>- return createRenderObject<RenderText>(*this, dataImpl());
</del><ins>+ return createRenderer<RenderText>(*this, dataImpl());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Text::childTypeAllowed(NodeType) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (161152 => 161153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-12-30 21:43:44 UTC (rev 161152)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-12-30 22:40:20 UTC (rev 161153)
</span><span class="lines">@@ -6695,7 +6695,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_scrollCorner) {
</span><del>- m_scrollCorner = createRenderObject<RenderScrollbarPart>(renderer().document(), corner.releaseNonNull());
</del><ins>+ m_scrollCorner = createRenderer<RenderScrollbarPart>(renderer().document(), corner.releaseNonNull());
</ins><span class="cx"> m_scrollCorner->setParent(&renderer());
</span><span class="cx"> m_scrollCorner->initializeStyle();
</span><span class="cx"> } else
</span><span class="lines">@@ -6713,7 +6713,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_resizer) {
</span><del>- m_resizer = createRenderObject<RenderScrollbarPart>(renderer().document(), resizer.releaseNonNull());
</del><ins>+ m_resizer = createRenderer<RenderScrollbarPart>(renderer().document(), resizer.releaseNonNull());
</ins><span class="cx"> m_resizer->setParent(&renderer());
</span><span class="cx"> m_resizer->initializeStyle();
</span><span class="cx"> } else
</span><span class="lines">@@ -6728,7 +6728,7 @@
</span><span class="cx"> void RenderLayer::createReflection()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_reflection);
</span><del>- m_reflection = createRenderObject<RenderReplica>(renderer().document(), createReflectionStyle());
</del><ins>+ m_reflection = createRenderer<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></pre></div>
<a id="trunkSourceWebCorerenderingRenderPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderPtr.h (161152 => 161153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderPtr.h 2013-12-30 21:43:44 UTC (rev 161152)
+++ trunk/Source/WebCore/rendering/RenderPtr.h 2013-12-30 22:40:20 UTC (rev 161153)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<class T, class... Args> inline RenderPtr<T>
</span><del>-createRenderObject(Args&&... args)
</del><ins>+createRenderer(Args&&... args)
</ins><span class="cx"> {
</span><span class="cx"> return RenderPtr<T>(new T(std::forward<Args>(args)...));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleContentDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/ContentData.cpp (161152 => 161153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/ContentData.cpp 2013-12-30 21:43:44 UTC (rev 161152)
+++ trunk/Source/WebCore/rendering/style/ContentData.cpp 2013-12-30 22:40:20 UTC (rev 161153)
</span><span class="lines">@@ -47,9 +47,9 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderPtr<RenderObject> ImageContentData::createRenderer(Document& document, const RenderStyle& pseudoStyle) const
</del><ins>+RenderPtr<RenderObject> ImageContentData::createContentRenderer(Document& document, const RenderStyle& pseudoStyle) const
</ins><span class="cx"> {
</span><del>- auto image = createRenderObject<RenderImage>(document, RenderImage::createStyleInheritingFromPseudoStyle(pseudoStyle));
</del><ins>+ auto image = createRenderer<RenderImage>(document, RenderImage::createStyleInheritingFromPseudoStyle(pseudoStyle));
</ins><span class="cx"> image->initializeStyle();
</span><span class="cx"> image->setAltText(altText());
</span><span class="cx"> if (m_image)
</span><span class="lines">@@ -59,21 +59,21 @@
</span><span class="cx"> return std::move(image);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderPtr<RenderObject> TextContentData::createRenderer(Document& document, const RenderStyle&) const
</del><ins>+RenderPtr<RenderObject> TextContentData::createContentRenderer(Document& document, const RenderStyle&) const
</ins><span class="cx"> {
</span><del>- auto fragment = createRenderObject<RenderTextFragment>(document, m_text);
</del><ins>+ auto fragment = createRenderer<RenderTextFragment>(document, m_text);
</ins><span class="cx"> fragment->setAltText(altText());
</span><span class="cx"> return std::move(fragment);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderPtr<RenderObject> CounterContentData::createRenderer(Document& document, const RenderStyle&) const
</del><ins>+RenderPtr<RenderObject> CounterContentData::createContentRenderer(Document& document, const RenderStyle&) const
</ins><span class="cx"> {
</span><del>- return createRenderObject<RenderCounter>(document, *m_counter);
</del><ins>+ return createRenderer<RenderCounter>(document, *m_counter);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RenderPtr<RenderObject> QuoteContentData::createRenderer(Document& document, const RenderStyle&) const
</del><ins>+RenderPtr<RenderObject> QuoteContentData::createContentRenderer(Document& document, const RenderStyle&) const
</ins><span class="cx"> {
</span><del>- return createRenderObject<RenderQuote>(document, m_quote);
</del><ins>+ return createRenderer<RenderQuote>(document, m_quote);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleContentDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/ContentData.h (161152 => 161153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/ContentData.h 2013-12-30 21:43:44 UTC (rev 161152)
+++ trunk/Source/WebCore/rendering/style/ContentData.h 2013-12-30 22:40:20 UTC (rev 161153)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> virtual bool isQuote() const { return false; }
</span><span class="cx"> virtual bool isText() const { return false; }
</span><span class="cx">
</span><del>- virtual RenderPtr<RenderObject> createRenderer(Document&, const RenderStyle&) const = 0;
</del><ins>+ virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const = 0;
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<ContentData> clone() const;
</span><span class="cx">
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> void setImage(PassRefPtr<StyleImage> image) { m_image = image; }
</span><span class="cx">
</span><span class="cx"> virtual bool isImage() const OVERRIDE { return true; }
</span><del>- virtual RenderPtr<RenderObject> createRenderer(Document&, const RenderStyle&) const OVERRIDE;
</del><ins>+ virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> virtual bool equals(const ContentData& data) const OVERRIDE
</span><span class="cx"> {
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> void setText(const String& text) { m_text = text; }
</span><span class="cx">
</span><span class="cx"> virtual bool isText() const OVERRIDE { return true; }
</span><del>- virtual RenderPtr<RenderObject> createRenderer(Document&, const RenderStyle&) const OVERRIDE;
</del><ins>+ virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> virtual bool equals(const ContentData& data) const OVERRIDE
</span><span class="cx"> {
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> void setCounter(std::unique_ptr<CounterContent> counter) { m_counter = std::move(counter); }
</span><span class="cx">
</span><span class="cx"> virtual bool isCounter() const OVERRIDE { return true; }
</span><del>- virtual RenderPtr<RenderObject> createRenderer(Document&, const RenderStyle&) const OVERRIDE;
</del><ins>+ virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual std::unique_ptr<ContentData> cloneInternal() const OVERRIDE
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> void setQuote(QuoteType quote) { m_quote = quote; }
</span><span class="cx">
</span><span class="cx"> virtual bool isQuote() const OVERRIDE { return true; }
</span><del>- virtual RenderPtr<RenderObject> createRenderer(Document&, const RenderStyle&) const OVERRIDE;
</del><ins>+ virtual RenderPtr<RenderObject> createContentRenderer(Document&, const RenderStyle&) const OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> virtual bool equals(const ContentData& data) const OVERRIDE
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>