<!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>[45517] trunk/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/45517">45517</a></dd>
<dt>Author</dt> <dd>eric@webkit.org</dd>
<dt>Date</dt> <dd>2009-07-02 18:29:07 -0700 (Thu, 02 Jul 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-07-02  Roland Steiner  &lt;rolandsteiner@google.com&gt;

        Reviewed by Eric Seidel.

        RenderBlock and RenderInline have confusingly named object creation methods:
        RenderBlock::createRootBox/createRootInlineBox
        RenderInline::createFlowBox/createInlineFlowBox
        where the 2nd method in both cases just calls the first and then appends the created object.
        I therefore renamed those methods to something IMHO more informative:

        createRootBox()         -&gt; createRootInlineBox()
        createRootInlineBox()   -&gt; createAndAppendRootInlineBox();
        createFlowBox()         -&gt; createInlineFlowBox();
        createInlineFlowBox()   -&gt; createAndAppendInlineFlowBox();

        https://bugs.webkit.org/show_bug.cgi?id=26828

        * rendering/RenderBlock.cpp:
        (WebCore::RenderBlock::createRootInlineBox):
        (WebCore::RenderBlock::createAndAppendRootInlineBox):
        * rendering/RenderBlock.h:
        * rendering/RenderInline.cpp:
        (WebCore::RenderInline::createInlineFlowBox):
        (WebCore::RenderInline::createAndAppendInlineFlowBox):
        * rendering/RenderInline.h:
        * rendering/RenderSVGInline.cpp:
        (WebCore::RenderSVGInline::createInlineFlowBox):
        * rendering/RenderSVGInline.h:
        * rendering/RenderSVGText.cpp:
        (WebCore::RenderSVGText::createRootInlineBox):
        * rendering/RenderSVGText.h:
        * rendering/bidi.cpp:
        (WebCore::createInlineBoxForRenderer):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorerenderingRenderBlockcpp">trunk/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderBlockh">trunk/WebCore/rendering/RenderBlock.h</a></li>
<li><a href="#trunkWebCorerenderingRenderInlinecpp">trunk/WebCore/rendering/RenderInline.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderInlineh">trunk/WebCore/rendering/RenderInline.h</a></li>
<li><a href="#trunkWebCorerenderingRenderSVGInlinecpp">trunk/WebCore/rendering/RenderSVGInline.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderSVGInlineh">trunk/WebCore/rendering/RenderSVGInline.h</a></li>
<li><a href="#trunkWebCorerenderingRenderSVGTextcpp">trunk/WebCore/rendering/RenderSVGText.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderSVGTexth">trunk/WebCore/rendering/RenderSVGText.h</a></li>
<li><a href="#trunkWebCorerenderingbidicpp">trunk/WebCore/rendering/bidi.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (45516 => 45517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-07-03 01:23:48 UTC (rev 45516)
+++ trunk/WebCore/ChangeLog        2009-07-03 01:29:07 UTC (rev 45517)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2009-07-02  Roland Steiner  &lt;rolandsteiner@google.com&gt;
+
+        Reviewed by Eric Seidel.
+
+        RenderBlock and RenderInline have confusingly named object creation methods:
+        RenderBlock::createRootBox/createRootInlineBox
+        RenderInline::createFlowBox/createInlineFlowBox
+        where the 2nd method in both cases just calls the first and then appends the created object.
+        I therefore renamed those methods to something IMHO more informative:
+        
+        createRootBox()         -&gt; createRootInlineBox()
+        createRootInlineBox()   -&gt; createAndAppendRootInlineBox();
+        createFlowBox()         -&gt; createInlineFlowBox();
+        createInlineFlowBox()   -&gt; createAndAppendInlineFlowBox();
+
+        https://bugs.webkit.org/show_bug.cgi?id=26828
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::createRootInlineBox):
+        (WebCore::RenderBlock::createAndAppendRootInlineBox):
+        * rendering/RenderBlock.h:
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::createInlineFlowBox):
+        (WebCore::RenderInline::createAndAppendInlineFlowBox):
+        * rendering/RenderInline.h:
+        * rendering/RenderSVGInline.cpp:
+        (WebCore::RenderSVGInline::createInlineFlowBox):
+        * rendering/RenderSVGInline.h:
+        * rendering/RenderSVGText.cpp:
+        (WebCore::RenderSVGText::createRootInlineBox):
+        * rendering/RenderSVGText.h:
+        * rendering/bidi.cpp:
+        (WebCore::createInlineBoxForRenderer):
+
</ins><span class="cx"> 2009-07-02  Pavel Feldman  &lt;pfeldman@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Timothy Hatcher.
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderBlock.cpp (45516 => 45517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderBlock.cpp        2009-07-03 01:23:48 UTC (rev 45516)
+++ trunk/WebCore/rendering/RenderBlock.cpp        2009-07-03 01:29:07 UTC (rev 45517)
</span><span class="lines">@@ -389,14 +389,14 @@
</span><span class="cx">     m_lineBoxes.deleteLineBoxTree(renderArena());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-RootInlineBox* RenderBlock::createRootBox()
</del><ins>+RootInlineBox* RenderBlock::createRootInlineBox() 
</ins><span class="cx"> {
</span><span class="cx">     return new (renderArena()) RootInlineBox(this);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-RootInlineBox* RenderBlock::createRootInlineBox()
</del><ins>+RootInlineBox* RenderBlock::createAndAppendRootInlineBox()
</ins><span class="cx"> {
</span><del>-    RootInlineBox* rootBox = createRootBox();
</del><ins>+    RootInlineBox* rootBox = createRootInlineBox();
</ins><span class="cx">     m_lineBoxes.appendLineBox(rootBox);
</span><span class="cx">     return rootBox;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderBlock.h (45516 => 45517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderBlock.h        2009-07-03 01:23:48 UTC (rev 45516)
+++ trunk/WebCore/rendering/RenderBlock.h        2009-07-03 01:29:07 UTC (rev 45517)
</span><span class="lines">@@ -142,7 +142,8 @@
</span><span class="cx"> 
</span><span class="cx">     virtual void updateBeforeAfterContent(PseudoId);
</span><span class="cx"> 
</span><del>-    RootInlineBox* createRootInlineBox();
</del><ins>+    RootInlineBox* createAndAppendRootInlineBox();
+    virtual RootInlineBox* createRootInlineBox(); // Subclassed by SVG and Ruby.
</ins><span class="cx"> 
</span><span class="cx">     // Called to lay out the legend for a fieldset.
</span><span class="cx">     virtual RenderObject* layoutLegend(bool /*relayoutChildren*/) { return 0; }
</span><span class="lines">@@ -342,7 +343,6 @@
</span><span class="cx">     virtual bool hasLineIfEmpty() const;
</span><span class="cx">     bool layoutOnlyPositionedObjects();
</span><span class="cx"> 
</span><del>-    virtual RootInlineBox* createRootBox(); // Subclassed by SVG.
</del><span class="cx">     
</span><span class="cx"> private:
</span><span class="cx">     Position positionForBox(InlineBox*, bool start = true) const;
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderInline.cpp (45516 => 45517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderInline.cpp        2009-07-03 01:23:48 UTC (rev 45516)
+++ trunk/WebCore/rendering/RenderInline.cpp        2009-07-03 01:29:07 UTC (rev 45517)
</span><span class="lines">@@ -749,14 +749,14 @@
</span><span class="cx">         m_lineBoxes.dirtyLineBoxes();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-InlineFlowBox* RenderInline::createFlowBox()
</del><ins>+InlineFlowBox* RenderInline::createInlineFlowBox() 
</ins><span class="cx"> {
</span><span class="cx">     return new (renderArena()) InlineFlowBox(this);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-InlineFlowBox* RenderInline::createInlineFlowBox()
</del><ins>+InlineFlowBox* RenderInline::createAndAppendInlineFlowBox()
</ins><span class="cx"> {
</span><del>-    InlineFlowBox* flowBox = createFlowBox();
</del><ins>+    InlineFlowBox* flowBox = createInlineFlowBox();
</ins><span class="cx">     m_lineBoxes.appendLineBox(flowBox);
</span><span class="cx">     return flowBox;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderInlineh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderInline.h (45516 => 45517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderInline.h        2009-07-03 01:23:48 UTC (rev 45516)
+++ trunk/WebCore/rendering/RenderInline.h        2009-07-03 01:29:07 UTC (rev 45517)
</span><span class="lines">@@ -93,7 +93,9 @@
</span><span class="cx">         return IntRect(0, 0, boundingBox.width(), boundingBox.height());
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    InlineFlowBox* createInlineFlowBox();    
</del><ins>+    InlineFlowBox* createAndAppendInlineFlowBox();    
+    virtual InlineFlowBox* createInlineFlowBox(); // Subclassed by SVG and Ruby
+
</ins><span class="cx">     void dirtyLineBoxes(bool fullLayout);
</span><span class="cx">     virtual void dirtyLinesFromChangedChild(RenderObject* child) { m_lineBoxes.dirtyLinesFromChangedChild(this, child); }
</span><span class="cx"> 
</span><span class="lines">@@ -132,7 +134,6 @@
</span><span class="cx"> protected:
</span><span class="cx">     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
</span><span class="cx">     virtual void updateBoxModelInfoFromStyle();
</span><del>-    virtual InlineFlowBox* createFlowBox(); // Subclassed by SVG
</del><span class="cx">     
</span><span class="cx">     static RenderInline* cloneInline(RenderInline* src);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderSVGInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderSVGInline.cpp (45516 => 45517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderSVGInline.cpp        2009-07-03 01:23:48 UTC (rev 45516)
+++ trunk/WebCore/rendering/RenderSVGInline.cpp        2009-07-03 01:29:07 UTC (rev 45517)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-InlineFlowBox* RenderSVGInline::createFlowBox()
</del><ins>+InlineFlowBox* RenderSVGInline::createInlineFlowBox()
</ins><span class="cx"> {
</span><span class="cx">     InlineFlowBox* box = new (renderArena()) SVGInlineFlowBox(this);
</span><span class="cx">     box-&gt;setIsSVG(true);
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderSVGInlineh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderSVGInline.h (45516 => 45517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderSVGInline.h        2009-07-03 01:23:48 UTC (rev 45516)
+++ trunk/WebCore/rendering/RenderSVGInline.h        2009-07-03 01:29:07 UTC (rev 45517)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">     virtual void absoluteQuads(Vector&lt;FloatQuad&gt;&amp;);
</span><span class="cx">     
</span><span class="cx"> private:
</span><del>-    virtual InlineFlowBox* createFlowBox();
</del><ins>+    virtual InlineFlowBox* createInlineFlowBox();
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderSVGTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderSVGText.cpp (45516 => 45517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderSVGText.cpp        2009-07-03 01:23:48 UTC (rev 45516)
+++ trunk/WebCore/rendering/RenderSVGText.cpp        2009-07-03 01:29:07 UTC (rev 45517)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">     setNeedsLayout(false);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-RootInlineBox* RenderSVGText::createRootBox()
</del><ins>+RootInlineBox* RenderSVGText::createRootInlineBox() 
</ins><span class="cx"> {
</span><span class="cx">     RootInlineBox* box = new (renderArena()) SVGRootInlineBox(this);
</span><span class="cx">     box-&gt;setIsSVG(true);
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderSVGTexth"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderSVGText.h (45516 => 45517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderSVGText.h        2009-07-03 01:23:48 UTC (rev 45516)
+++ trunk/WebCore/rendering/RenderSVGText.h        2009-07-03 01:29:07 UTC (rev 45517)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">     // FIXME: This can be removed when localTransform() is removed from RenderObject
</span><span class="cx">     virtual TransformationMatrix localTransform() const { return m_localTransform; }
</span><span class="cx"> 
</span><del>-    virtual RootInlineBox* createRootBox();
</del><ins>+    virtual RootInlineBox* createRootInlineBox();
</ins><span class="cx"> 
</span><span class="cx">     TransformationMatrix m_localTransform;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkWebCorerenderingbidicpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/bidi.cpp (45516 => 45517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/bidi.cpp        2009-07-03 01:23:48 UTC (rev 45516)
+++ trunk/WebCore/rendering/bidi.cpp        2009-07-03 01:29:07 UTC (rev 45517)
</span><span class="lines">@@ -449,7 +449,7 @@
</span><span class="cx"> static inline InlineBox* createInlineBoxForRenderer(RenderObject* obj, bool isRootLineBox, bool isOnlyRun = false)
</span><span class="cx"> {
</span><span class="cx">     if (isRootLineBox)
</span><del>-        return toRenderBlock(obj)-&gt;createRootInlineBox();
</del><ins>+        return toRenderBlock(obj)-&gt;createAndAppendRootInlineBox();
</ins><span class="cx">     
</span><span class="cx">     if (obj-&gt;isText()) {
</span><span class="cx">         InlineTextBox* textBox = toRenderText(obj)-&gt;createInlineTextBox();
</span><span class="lines">@@ -463,7 +463,7 @@
</span><span class="cx">     if (obj-&gt;isBox())
</span><span class="cx">         return toRenderBox(obj)-&gt;createInlineBox();
</span><span class="cx">     
</span><del>-    return toRenderInline(obj)-&gt;createInlineFlowBox();
</del><ins>+    return toRenderInline(obj)-&gt;createAndAppendInlineFlowBox();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static inline void dirtyLineBoxesForRenderer(RenderObject* o, bool fullLayout)
</span></span></pre>
</div>
</div>

</body>
</html>