<!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>[169038] 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/169038">169038</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-05-18 23:44:35 -0700 (Sun, 18 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reduce constructor copypasta in RenderText and RenderElement.
<https://webkit.org/b/133056>
Use delegating constructors to remove duplicated initializer lists
from the constructors of RenderText and RenderElement.
Reviewed by Anders Carlsson.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::RenderElement):
* rendering/RenderElement.h:
* rendering/RenderText.cpp:
(WebCore::RenderText::RenderText):
* rendering/RenderText.h:</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="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextcpp">trunk/Source/WebCore/rendering/RenderText.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTexth">trunk/Source/WebCore/rendering/RenderText.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169037 => 169038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-19 05:50:30 UTC (rev 169037)
+++ trunk/Source/WebCore/ChangeLog 2014-05-19 06:44:35 UTC (rev 169038)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-05-18 Andreas Kling <akling@apple.com>
+
+ Reduce constructor copypasta in RenderText and RenderElement.
+ <https://webkit.org/b/133056>
+
+ Use delegating constructors to remove duplicated initializer lists
+ from the constructors of RenderText and RenderElement.
+
+ Reviewed by Anders Carlsson.
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::RenderElement):
+ * rendering/RenderElement.h:
+ * rendering/RenderText.cpp:
+ (WebCore::RenderText::RenderText):
+ * rendering/RenderText.h:
+
</ins><span class="cx"> 2014-05-18 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash during scroll when latched
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (169037 => 169038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2014-05-19 05:50:30 UTC (rev 169037)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2014-05-19 06:44:35 UTC (rev 169038)
</span><span class="lines">@@ -76,9 +76,9 @@
</span><span class="cx"> static NeverDestroyed<HashMap<const RenderObject*, ControlStates*>> map;
</span><span class="cx"> return map;
</span><span class="cx"> }
</span><del>-
-RenderElement::RenderElement(Element& element, PassRef<RenderStyle> style, unsigned baseTypeFlags)
- : RenderObject(element)
</del><ins>+
+inline RenderElement::RenderElement(ContainerNode& elementOrDocument, PassRef<RenderStyle> style, unsigned baseTypeFlags)
+ : RenderObject(elementOrDocument)
</ins><span class="cx"> , m_baseTypeFlags(baseTypeFlags)
</span><span class="cx"> , m_ancestorLineBoxDirty(false)
</span><span class="cx"> , m_hasInitializedStyle(false)
</span><span class="lines">@@ -91,17 +91,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RenderElement::RenderElement(Element& element, PassRef<RenderStyle> style, unsigned baseTypeFlags)
+ : RenderElement(static_cast<ContainerNode&>(element), std::move(style), baseTypeFlags)
+{
+}
+
</ins><span class="cx"> RenderElement::RenderElement(Document& document, PassRef<RenderStyle> style, unsigned baseTypeFlags)
</span><del>- : RenderObject(document)
- , m_baseTypeFlags(baseTypeFlags)
- , m_ancestorLineBoxDirty(false)
- , m_hasInitializedStyle(false)
- , m_renderInlineAlwaysCreatesLineBoxes(false)
- , m_renderBoxNeedsLazyRepaint(false)
- , m_hasPausedImageAnimations(false)
- , m_firstChild(nullptr)
- , m_lastChild(nullptr)
- , m_style(std::move(style))
</del><ins>+ : RenderElement(static_cast<ContainerNode&>(document), std::move(style), baseTypeFlags)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (169037 => 169038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2014-05-19 05:50:30 UTC (rev 169037)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2014-05-19 06:44:35 UTC (rev 169038)
</span><span class="lines">@@ -199,6 +199,7 @@
</span><span class="cx"> static void addControlStatesForRenderer(const RenderObject*, ControlStates*);
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ RenderElement(ContainerNode&, PassRef<RenderStyle>, unsigned baseTypeFlags);
</ins><span class="cx"> void node() const = delete;
</span><span class="cx"> void nonPseudoNode() const = delete;
</span><span class="cx"> void generatingNode() const = delete;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.cpp (169037 => 169038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.cpp 2014-05-19 05:50:30 UTC (rev 169037)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2014-05-19 06:44:35 UTC (rev 169038)
</span><span class="lines">@@ -153,8 +153,8 @@
</span><span class="cx"> *string = result.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderText::RenderText(Text& textNode, const String& text)
- : RenderObject(textNode)
</del><ins>+inline RenderText::RenderText(Node& node, const String& text)
+ : RenderObject(node)
</ins><span class="cx"> , m_hasTab(false)
</span><span class="cx"> , m_linesDirty(false)
</span><span class="cx"> , m_containsReversedText(false)
</span><span class="lines">@@ -177,28 +177,14 @@
</span><span class="cx"> view().frameView().incrementVisuallyNonEmptyCharacterCount(textLength());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RenderText::RenderText(Text& textNode, const String& text)
+ : RenderText(static_cast<Node&>(textNode), text)
+{
+}
+
</ins><span class="cx"> RenderText::RenderText(Document& document, const String& text)
</span><del>- : RenderObject(document)
- , m_hasTab(false)
- , m_linesDirty(false)
- , m_containsReversedText(false)
- , m_isAllASCII(text.containsOnlyASCII())
- , m_knownToHaveNoOverflowAndNoFallbackFonts(false)
- , m_useBackslashAsYenSymbol(false)
- , m_originalTextDiffersFromRendered(false)
-#if ENABLE(IOS_TEXT_AUTOSIZING)
- , m_candidateComputedTextSize(0)
-#endif
- , m_minWidth(-1)
- , m_maxWidth(-1)
- , m_beginMinWidth(0)
- , m_endMinWidth(0)
- , m_text(text)
</del><ins>+ : RenderText(static_cast<Node&>(document), text)
</ins><span class="cx"> {
</span><del>- ASSERT(!m_text.isNull());
- setIsText();
- m_canUseSimpleFontCodePath = computeCanUseSimpleFontCodePath();
- view().frameView().incrementVisuallyNonEmptyCharacterCount(textLength());
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderText::~RenderText()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.h (169037 => 169038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.h 2014-05-19 05:50:30 UTC (rev 169037)
+++ trunk/Source/WebCore/rendering/RenderText.h 2014-05-19 06:44:35 UTC (rev 169038)
</span><span class="lines">@@ -162,6 +162,8 @@
</span><span class="cx"> virtual UChar previousCharacter() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ RenderText(Node&, const String&);
+
</ins><span class="cx"> virtual bool canHaveChildren() const override final { return false; }
</span><span class="cx">
</span><span class="cx"> void computePreferredLogicalWidths(float leadWidth, HashSet<const SimpleFontData*>& fallbackFonts, GlyphOverflow&);
</span></span></pre>
</div>
</div>
</body>
</html>