<!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>[175242] 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/175242">175242</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-10-27 22:39:40 -0700 (Mon, 27 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move RenderBlock::beingDestroyed() to RenderObject.
<https://webkit.org/b/138116>
Reviewed by Antti Koivisto.
Make "is being destroyed" a RenderObject concept instead of restricting
it to RenderBlocks. I'm guessing that this was specific to blocks due to
lack of bitfield space in RenderObject, and that's no longer an issue.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::RenderBlock):
(WebCore::RenderBlock::willBeDestroyed):
* rendering/RenderBlock.h:
(WebCore::RenderBlock::beingDestroyed): Deleted.
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::willBeDestroyed):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::destroy):
* rendering/RenderObject.h:
(WebCore::RenderObject::beingDestroyed):
(WebCore::RenderObject::RenderObjectBitfields::RenderObjectBitfields):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockh">trunk/Source/WebCore/rendering/RenderBlock.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175241 => 175242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-28 05:38:48 UTC (rev 175241)
+++ trunk/Source/WebCore/ChangeLog 2014-10-28 05:39:40 UTC (rev 175242)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-10-27 Andreas Kling <akling@apple.com>
+
+ Move RenderBlock::beingDestroyed() to RenderObject.
+ <https://webkit.org/b/138116>
+
+ Reviewed by Antti Koivisto.
+
+ Make "is being destroyed" a RenderObject concept instead of restricting
+ it to RenderBlocks. I'm guessing that this was specific to blocks due to
+ lack of bitfield space in RenderObject, and that's no longer an issue.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::RenderBlock):
+ (WebCore::RenderBlock::willBeDestroyed):
+ * rendering/RenderBlock.h:
+ (WebCore::RenderBlock::beingDestroyed): Deleted.
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::willBeDestroyed):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::destroy):
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::beingDestroyed):
+ (WebCore::RenderObject::RenderObjectBitfields::RenderObjectBitfields):
+
</ins><span class="cx"> 2014-10-27 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: input type=hidden is being exposed when aria-hidden=false
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (175241 => 175242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-10-28 05:38:48 UTC (rev 175241)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-10-28 05:39:40 UTC (rev 175242)
</span><span class="lines">@@ -186,7 +186,6 @@
</span><span class="cx"> , m_lineHeight(-1)
</span><span class="cx"> , m_hasMarginBeforeQuirk(false)
</span><span class="cx"> , m_hasMarginAfterQuirk(false)
</span><del>- , m_beingDestroyed(false)
</del><span class="cx"> , m_hasMarkupTruncation(false)
</span><span class="cx"> , m_hasBorderOrPaddingLogicalWidthChanged(false)
</span><span class="cx"> , m_lineLayoutPath(UndeterminedPath)
</span><span class="lines">@@ -198,7 +197,6 @@
</span><span class="cx"> , m_lineHeight(-1)
</span><span class="cx"> , m_hasMarginBeforeQuirk(false)
</span><span class="cx"> , m_hasMarginAfterQuirk(false)
</span><del>- , m_beingDestroyed(false)
</del><span class="cx"> , m_hasMarkupTruncation(false)
</span><span class="cx"> , m_hasBorderOrPaddingLogicalWidthChanged(false)
</span><span class="cx"> , m_lineLayoutPath(UndeterminedPath)
</span><span class="lines">@@ -240,9 +238,6 @@
</span><span class="cx">
</span><span class="cx"> void RenderBlock::willBeDestroyed()
</span><span class="cx"> {
</span><del>- // Mark as being destroyed to avoid trouble with merges in removeChild().
- m_beingDestroyed = true;
-
</del><span class="cx"> // Make sure to destroy anonymous children first while they are still connected to the rest of the tree, so that they will
</span><span class="cx"> // properly dirty line boxes that they are removed from. Effects that do :before/:after only on hover could crash otherwise.
</span><span class="cx"> destroyLeftoverChildren();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.h (175241 => 175242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.h 2014-10-28 05:38:48 UTC (rev 175241)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2014-10-28 05:39:40 UTC (rev 175242)
</span><span class="lines">@@ -65,8 +65,6 @@
</span><span class="cx"> virtual ~RenderBlock();
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- bool beingDestroyed() const { return m_beingDestroyed; }
-
</del><span class="cx"> // These two functions are overridden for inline-block.
</span><span class="cx"> virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override final;
</span><span class="cx"> virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
</span><span class="lines">@@ -518,7 +516,6 @@
</span><span class="cx"> mutable signed m_lineHeight : 25;
</span><span class="cx"> unsigned m_hasMarginBeforeQuirk : 1; // Note these quirk values can't be put in RenderBlockRareData since they are set too frequently.
</span><span class="cx"> unsigned m_hasMarginAfterQuirk : 1;
</span><del>- unsigned m_beingDestroyed : 1;
</del><span class="cx"> unsigned m_hasMarkupTruncation : 1;
</span><span class="cx"> unsigned m_hasBorderOrPaddingLogicalWidthChanged : 1;
</span><span class="cx"> enum LineLayoutPath { UndeterminedPath, SimpleLinesPath, LineBoxesPath, ForceLineBoxesPath };
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (175241 => 175242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-10-28 05:38:48 UTC (rev 175241)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-10-28 05:39:40 UTC (rev 175242)
</span><span class="lines">@@ -143,9 +143,6 @@
</span><span class="cx">
</span><span class="cx"> void RenderBlockFlow::willBeDestroyed()
</span><span class="cx"> {
</span><del>- // Mark as being destroyed to avoid trouble with merges in removeChild().
- m_beingDestroyed = true;
-
</del><span class="cx"> if (renderNamedFlowFragment())
</span><span class="cx"> setRenderNamedFlowFragment(0);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (175241 => 175242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-10-28 05:38:48 UTC (rev 175241)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-10-28 05:39:40 UTC (rev 175242)
</span><span class="lines">@@ -2061,6 +2061,8 @@
</span><span class="cx">
</span><span class="cx"> void RenderObject::destroy()
</span><span class="cx"> {
</span><ins>+ m_bitfields.setBeingDestroyed(true);
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (hasLayer())
</span><span class="cx"> downcast<RenderBoxModelObject>(*this).layer()->willBeDestroyed();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (175241 => 175242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2014-10-28 05:38:48 UTC (rev 175241)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2014-10-28 05:39:40 UTC (rev 175242)
</span><span class="lines">@@ -378,6 +378,8 @@
</span><span class="cx"> static inline bool isAfterContent(const RenderObject* obj) { return obj && obj->isAfterContent(); }
</span><span class="cx"> static inline bool isBeforeOrAfterContent(const RenderObject* obj) { return obj && obj->isBeforeOrAfterContent(); }
</span><span class="cx">
</span><ins>+ bool beingDestroyed() const { return m_bitfields.beingDestroyed(); }
+
</ins><span class="cx"> bool everHadLayout() const { return m_bitfields.everHadLayout(); }
</span><span class="cx">
</span><span class="cx"> bool childrenInline() const { return m_bitfields.childrenInline(); }
</span><span class="lines">@@ -920,7 +922,8 @@
</span><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> RenderObjectBitfields(const Node& node)
</span><del>- : m_needsLayout(false)
</del><ins>+ : m_beingDestroyed(false)
+ , m_needsLayout(false)
</ins><span class="cx"> , m_needsPositionedMovementLayout(false)
</span><span class="cx"> , m_normalChildNeedsLayout(false)
</span><span class="cx"> , m_posChildNeedsLayout(false)
</span><span class="lines">@@ -948,7 +951,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // 31 bits have been used here. There is one bit available.
</del><ins>+ ADD_BOOLEAN_BITFIELD(beingDestroyed, BeingDestroyed);
</ins><span class="cx"> ADD_BOOLEAN_BITFIELD(needsLayout, NeedsLayout);
</span><span class="cx"> ADD_BOOLEAN_BITFIELD(needsPositionedMovementLayout, NeedsPositionedMovementLayout);
</span><span class="cx"> ADD_BOOLEAN_BITFIELD(normalChildNeedsLayout, NormalChildNeedsLayout);
</span></span></pre>
</div>
</div>
</body>
</html>