<!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>[182373] 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/182373">182373</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-04-05 19:59:57 -0700 (Sun, 05 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Free up some bits in RenderObject by moving rarely used bits into a side table
https://bugs.webkit.org/show_bug.cgi?id=143432
Reviewed by Darin Adler.
Add a side table (global hash) on RenderObject to store data that is rarely
used. Move the "isDragging" and "hasReflection" bits there. Re-use one of
those bits for "hasRareData", and leave the other unused (I have plans for it).
* rendering/RenderBlock.cpp:
(WebCore::getBlockRareData): Renamed for consistency.
(WebCore::ensureBlockRareData): Renamed to avoid conflict with RenderObject::ensureRareData().
(WebCore::RenderBlock::cachedFlowThreadContainingBlock):
(WebCore::RenderBlock::cachedFlowThreadContainingBlockNeedsUpdate):
(WebCore::RenderBlock::setCachedFlowThreadContainingBlockNeedsUpdate):
(WebCore::RenderBlock::updateCachedFlowThreadContainingBlock):
(WebCore::RenderBlock::locateFlowThreadContainingBlock):
(WebCore::RenderBlock::paginationStrut):
(WebCore::RenderBlock::pageLogicalOffset):
(WebCore::RenderBlock::setPaginationStrut):
(WebCore::RenderBlock::setPageLogicalOffset):
(WebCore::getRareData): Deleted.
(WebCore::ensureRareData): Deleted.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::~RenderObject): Assert that rare data hasn't been resurrected
since willBeDestroyed().
(WebCore::RenderObject::willBeDestroyed): Clear the rare data.
(WebCore::RenderObject::setIsDragging): If setting, ensure that we have rare data and
set the bit. Otherwise, only clear the bit of we have rare data.
(WebCore::RenderObject::setHasReflection): Ditto.
(WebCore::RenderObject::rareDataMap):
(WebCore::RenderObject::rareData):
(WebCore::RenderObject::ensureRareData):
(WebCore::RenderObject::clearRareData):
* rendering/RenderObject.h:
(WebCore::RenderObject::isDragging): Fast-fail on the hasRareData() bit, then do the
slower lookup in rare data.
(WebCore::RenderObject::hasReflection): Ditto.
(WebCore::RenderObject::setEverHadLayout): Moved up to group with other bit setters.
(WebCore::RenderObject::hasRareData):
(WebCore::RenderObject::setHasRareData):
(WebCore::RenderObject::RenderObjectBitfields::RenderObjectBitfields):
(WebCore::RenderObject::RenderObjectRareData::RenderObjectRareData):
(WebCore::RenderObject::setHasReflection): Deleted. Out of line now.
(WebCore::RenderObject::setIsDragging): Deleted. Ditto.</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="#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 (182372 => 182373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-06 01:56:28 UTC (rev 182372)
+++ trunk/Source/WebCore/ChangeLog 2015-04-06 02:59:57 UTC (rev 182373)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2015-04-05 Simon Fraser <simon.fraser@apple.com>
+
+ Free up some bits in RenderObject by moving rarely used bits into a side table
+ https://bugs.webkit.org/show_bug.cgi?id=143432
+
+ Reviewed by Darin Adler.
+
+ Add a side table (global hash) on RenderObject to store data that is rarely
+ used. Move the "isDragging" and "hasReflection" bits there. Re-use one of
+ those bits for "hasRareData", and leave the other unused (I have plans for it).
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::getBlockRareData): Renamed for consistency.
+ (WebCore::ensureBlockRareData): Renamed to avoid conflict with RenderObject::ensureRareData().
+ (WebCore::RenderBlock::cachedFlowThreadContainingBlock):
+ (WebCore::RenderBlock::cachedFlowThreadContainingBlockNeedsUpdate):
+ (WebCore::RenderBlock::setCachedFlowThreadContainingBlockNeedsUpdate):
+ (WebCore::RenderBlock::updateCachedFlowThreadContainingBlock):
+ (WebCore::RenderBlock::locateFlowThreadContainingBlock):
+ (WebCore::RenderBlock::paginationStrut):
+ (WebCore::RenderBlock::pageLogicalOffset):
+ (WebCore::RenderBlock::setPaginationStrut):
+ (WebCore::RenderBlock::setPageLogicalOffset):
+ (WebCore::getRareData): Deleted.
+ (WebCore::ensureRareData): Deleted.
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::~RenderObject): Assert that rare data hasn't been resurrected
+ since willBeDestroyed().
+ (WebCore::RenderObject::willBeDestroyed): Clear the rare data.
+ (WebCore::RenderObject::setIsDragging): If setting, ensure that we have rare data and
+ set the bit. Otherwise, only clear the bit of we have rare data.
+ (WebCore::RenderObject::setHasReflection): Ditto.
+ (WebCore::RenderObject::rareDataMap):
+ (WebCore::RenderObject::rareData):
+ (WebCore::RenderObject::ensureRareData):
+ (WebCore::RenderObject::clearRareData):
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::isDragging): Fast-fail on the hasRareData() bit, then do the
+ slower lookup in rare data.
+ (WebCore::RenderObject::hasReflection): Ditto.
+ (WebCore::RenderObject::setEverHadLayout): Moved up to group with other bit setters.
+ (WebCore::RenderObject::hasRareData):
+ (WebCore::RenderObject::setHasRareData):
+ (WebCore::RenderObject::RenderObjectBitfields::RenderObjectBitfields):
+ (WebCore::RenderObject::RenderObjectRareData::RenderObjectRareData):
+ (WebCore::RenderObject::setHasReflection): Deleted. Out of line now.
+ (WebCore::RenderObject::setIsDragging): Deleted. Ditto.
+
</ins><span class="cx"> 2015-04-05 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r181778): Crash after scrolling Google search result page
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (182372 => 182373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-04-06 01:56:28 UTC (rev 182372)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-04-06 02:59:57 UTC (rev 182373)
</span><span class="lines">@@ -933,12 +933,12 @@
</span><span class="cx"> invalidateBackgroundObscurationStatus();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RenderBlockRareData* getRareData(const RenderBlock* block)
</del><ins>+static RenderBlockRareData* getBlockRareData(const RenderBlock* block)
</ins><span class="cx"> {
</span><del>- return gRareDataMap ? gRareDataMap->get(block) : 0;
</del><ins>+ return gRareDataMap ? gRareDataMap->get(block) : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static RenderBlockRareData& ensureRareData(const RenderBlock* block)
</del><ins>+static RenderBlockRareData& ensureBlockRareData(const RenderBlock* block)
</ins><span class="cx"> {
</span><span class="cx"> if (!gRareDataMap)
</span><span class="cx"> gRareDataMap = new RenderBlockRareDataMap;
</span><span class="lines">@@ -3232,7 +3232,7 @@
</span><span class="cx">
</span><span class="cx"> RenderFlowThread* RenderBlock::cachedFlowThreadContainingBlock() const
</span><span class="cx"> {
</span><del>- RenderBlockRareData* rareData = getRareData(this);
</del><ins>+ RenderBlockRareData* rareData = getBlockRareData(this);
</ins><span class="cx">
</span><span class="cx"> if (!rareData || !rareData->m_flowThreadContainingBlock)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -3242,7 +3242,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderBlock::cachedFlowThreadContainingBlockNeedsUpdate() const
</span><span class="cx"> {
</span><del>- RenderBlockRareData* rareData = getRareData(this);
</del><ins>+ RenderBlockRareData* rareData = getBlockRareData(this);
</ins><span class="cx">
</span><span class="cx"> if (!rareData || !rareData->m_flowThreadContainingBlock)
</span><span class="cx"> return true;
</span><span class="lines">@@ -3252,13 +3252,13 @@
</span><span class="cx">
</span><span class="cx"> void RenderBlock::setCachedFlowThreadContainingBlockNeedsUpdate()
</span><span class="cx"> {
</span><del>- RenderBlockRareData& rareData = ensureRareData(this);
</del><ins>+ RenderBlockRareData& rareData = ensureBlockRareData(this);
</ins><span class="cx"> rareData.m_flowThreadContainingBlock = Nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderFlowThread* RenderBlock::updateCachedFlowThreadContainingBlock(RenderFlowThread* flowThread) const
</span><span class="cx"> {
</span><del>- RenderBlockRareData& rareData = ensureRareData(this);
</del><ins>+ RenderBlockRareData& rareData = ensureBlockRareData(this);
</ins><span class="cx"> rareData.m_flowThreadContainingBlock = flowThread;
</span><span class="cx">
</span><span class="cx"> return flowThread;
</span><span class="lines">@@ -3266,7 +3266,7 @@
</span><span class="cx">
</span><span class="cx"> RenderFlowThread* RenderBlock::locateFlowThreadContainingBlock() const
</span><span class="cx"> {
</span><del>- RenderBlockRareData* rareData = getRareData(this);
</del><ins>+ RenderBlockRareData* rareData = getBlockRareData(this);
</ins><span class="cx"> if (!rareData || !rareData->m_flowThreadContainingBlock)
</span><span class="cx"> return updateCachedFlowThreadContainingBlock(RenderBox::locateFlowThreadContainingBlock());
</span><span class="cx">
</span><span class="lines">@@ -3276,34 +3276,34 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderBlock::paginationStrut() const
</span><span class="cx"> {
</span><del>- RenderBlockRareData* rareData = getRareData(this);
</del><ins>+ RenderBlockRareData* rareData = getBlockRareData(this);
</ins><span class="cx"> return rareData ? rareData->m_paginationStrut : LayoutUnit();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderBlock::pageLogicalOffset() const
</span><span class="cx"> {
</span><del>- RenderBlockRareData* rareData = getRareData(this);
</del><ins>+ RenderBlockRareData* rareData = getBlockRareData(this);
</ins><span class="cx"> return rareData ? rareData->m_pageLogicalOffset : LayoutUnit();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBlock::setPaginationStrut(LayoutUnit strut)
</span><span class="cx"> {
</span><del>- RenderBlockRareData* rareData = getRareData(this);
</del><ins>+ RenderBlockRareData* rareData = getBlockRareData(this);
</ins><span class="cx"> if (!rareData) {
</span><span class="cx"> if (!strut)
</span><span class="cx"> return;
</span><del>- rareData = &ensureRareData(this);
</del><ins>+ rareData = &ensureBlockRareData(this);
</ins><span class="cx"> }
</span><span class="cx"> rareData->m_paginationStrut = strut;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBlock::setPageLogicalOffset(LayoutUnit logicalOffset)
</span><span class="cx"> {
</span><del>- RenderBlockRareData* rareData = getRareData(this);
</del><ins>+ RenderBlockRareData* rareData = getBlockRareData(this);
</ins><span class="cx"> if (!rareData) {
</span><span class="cx"> if (!logicalOffset)
</span><span class="cx"> return;
</span><del>- rareData = &ensureRareData(this);
</del><ins>+ rareData = &ensureBlockRareData(this);
</ins><span class="cx"> }
</span><span class="cx"> rareData->m_pageLogicalOffset = logicalOffset;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (182372 => 182373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2015-04-06 01:56:28 UTC (rev 182372)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2015-04-06 02:59:57 UTC (rev 182373)
</span><span class="lines">@@ -130,6 +130,7 @@
</span><span class="cx"> renderObjectCounter.decrement();
</span><span class="cx"> #endif
</span><span class="cx"> view().didDestroyRenderer();
</span><ins>+ ASSERT(!hasRareData());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderTheme& RenderObject::theme() const
</span><span class="lines">@@ -1903,6 +1904,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> clearLayoutRootIfNeeded();
</span><ins>+ removeRareData();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderObject::insertedIntoTree()
</span><span class="lines">@@ -2495,6 +2497,44 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderObject::setIsDragging(bool isDragging)
+{
+ if (isDragging || hasRareData())
+ ensureRareData().setIsDragging(isDragging);
+}
+
+void RenderObject::setHasReflection(bool hasReflection)
+{
+ if (hasReflection || hasRareData())
+ ensureRareData().setHasReflection(hasReflection);
+}
+
+RenderObject::RareDataHash& RenderObject::rareDataMap()
+{
+ static NeverDestroyed<RareDataHash> map;
+ return map;
+}
+
+RenderObject::RenderObjectRareData RenderObject::rareData() const
+{
+ if (!hasRareData())
+ return RenderObjectRareData();
+
+ return rareDataMap().get(this);
+}
+
+RenderObject::RenderObjectRareData& RenderObject::ensureRareData()
+{
+ setHasRareData(true);
+ return rareDataMap().add(this, RenderObjectRareData()).iterator->value;
+}
+
+void RenderObject::removeRareData()
+{
+ rareDataMap().remove(this);
+ setHasRareData(false);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TREE_DEBUGGING)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (182372 => 182373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2015-04-06 01:56:28 UTC (rev 182372)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2015-04-06 02:59:57 UTC (rev 182373)
</span><span class="lines">@@ -515,7 +515,6 @@
</span><span class="cx"> bool isBox() const { return m_bitfields.isBox(); }
</span><span class="cx"> bool isRenderView() const { return m_bitfields.isBox() && m_bitfields.isTextOrRenderView(); }
</span><span class="cx"> bool isInline() const { return m_bitfields.isInline(); } // inline object
</span><del>- bool isDragging() const { return m_bitfields.isDragging(); }
</del><span class="cx"> bool isReplaced() const { return m_bitfields.isReplaced(); } // a "replaced" element (see CSS)
</span><span class="cx"> bool isHorizontalWritingMode() const { return m_bitfields.horizontalWritingMode(); }
</span><span class="cx">
</span><span class="lines">@@ -623,8 +622,13 @@
</span><span class="cx"> void setHasOverflowClip(bool b = true) { m_bitfields.setHasOverflowClip(b); }
</span><span class="cx"> void setHasLayer(bool b = true) { m_bitfields.setHasLayer(b); }
</span><span class="cx"> void setHasTransformRelatedProperty(bool b = true) { m_bitfields.setHasTransformRelatedProperty(b); }
</span><del>- void setHasReflection(bool b = true) { m_bitfields.setHasReflection(b); }
</del><span class="cx">
</span><ins>+ bool isDragging() const { return m_bitfields.hasRareData() && rareData().isDragging(); }
+ bool hasReflection() const { return m_bitfields.hasRareData() && rareData().hasReflection(); }
+
+ void setIsDragging(bool);
+ void setHasReflection(bool = true);
+
</ins><span class="cx"> // Hook so that RenderTextControl can return the line height of its inner renderer.
</span><span class="cx"> // For other renderers, the value is the same as lineHeight(false).
</span><span class="cx"> virtual int innerLineHeight() const;
</span><span class="lines">@@ -755,8 +759,6 @@
</span><span class="cx">
</span><span class="cx"> bool isFloatingOrOutOfFlowPositioned() const { return (isFloating() || isOutOfFlowPositioned()); }
</span><span class="cx">
</span><del>- bool hasReflection() const { return m_bitfields.hasReflection(); }
-
</del><span class="cx"> // Applied as a "slop" to dirty rect checks during the outline painting phase's dirty-rect checks.
</span><span class="cx"> int maximalOutlineSize(PaintPhase) const;
</span><span class="cx">
</span><span class="lines">@@ -883,6 +885,11 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isWBR() const { ASSERT_NOT_REACHED(); return false; }
</span><span class="cx">
</span><ins>+ void setEverHadLayout(bool b) { m_bitfields.setEverHadLayout(b); }
+
+ bool hasRareData() const { return m_bitfields.hasRareData(); }
+ void setHasRareData(bool b) { m_bitfields.setHasRareData(b); }
+
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> void checkBlockPositionedObjectsNeedLayout();
</span><span class="cx"> #endif
</span><span class="lines">@@ -915,7 +922,8 @@
</span><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> RenderObjectBitfields(const Node& node)
</span><del>- : m_beingDestroyed(false)
</del><ins>+ : m_hasRareData(false)
+ , m_beingDestroyed(false)
</ins><span class="cx"> , m_needsLayout(false)
</span><span class="cx"> , m_needsPositionedMovementLayout(false)
</span><span class="cx"> , m_normalChildNeedsLayout(false)
</span><span class="lines">@@ -930,11 +938,9 @@
</span><span class="cx"> , m_isReplaced(false)
</span><span class="cx"> , m_isLineBreak(false)
</span><span class="cx"> , m_horizontalWritingMode(true)
</span><del>- , m_isDragging(false)
</del><span class="cx"> , m_hasLayer(false)
</span><span class="cx"> , m_hasOverflowClip(false)
</span><span class="cx"> , m_hasTransformRelatedProperty(false)
</span><del>- , m_hasReflection(false)
</del><span class="cx"> , m_everHadLayout(false)
</span><span class="cx"> , m_childrenInline(false)
</span><span class="cx"> , m_positionedState(IsStaticallyPositioned)
</span><span class="lines">@@ -943,6 +949,8 @@
</span><span class="cx"> , m_boxDecorationState(NoBoxDecorations)
</span><span class="cx"> {
</span><span class="cx"> }
</span><ins>+
+ ADD_BOOLEAN_BITFIELD(hasRareData, HasRareData);
</ins><span class="cx">
</span><span class="cx"> ADD_BOOLEAN_BITFIELD(beingDestroyed, BeingDestroyed);
</span><span class="cx"> ADD_BOOLEAN_BITFIELD(needsLayout, NeedsLayout);
</span><span class="lines">@@ -960,12 +968,11 @@
</span><span class="cx"> ADD_BOOLEAN_BITFIELD(isReplaced, IsReplaced);
</span><span class="cx"> ADD_BOOLEAN_BITFIELD(isLineBreak, IsLineBreak);
</span><span class="cx"> ADD_BOOLEAN_BITFIELD(horizontalWritingMode, HorizontalWritingMode);
</span><del>- ADD_BOOLEAN_BITFIELD(isDragging, IsDragging);
</del><span class="cx">
</span><span class="cx"> ADD_BOOLEAN_BITFIELD(hasLayer, HasLayer);
</span><span class="cx"> ADD_BOOLEAN_BITFIELD(hasOverflowClip, HasOverflowClip); // Set in the case of overflow:auto/scroll/hidden
</span><span class="cx"> ADD_BOOLEAN_BITFIELD(hasTransformRelatedProperty, HasTransformRelatedProperty);
</span><del>- ADD_BOOLEAN_BITFIELD(hasReflection, HasReflection);
</del><ins>+ ADD_BOOLEAN_BITFIELD(unused, Unused);
</ins><span class="cx">
</span><span class="cx"> ADD_BOOLEAN_BITFIELD(everHadLayout, EverHadLayout);
</span><span class="cx">
</span><span class="lines">@@ -1001,12 +1008,30 @@
</span><span class="cx"> ALWAYS_INLINE void setBoxDecorationState(BoxDecorationState boxDecorationState) { m_boxDecorationState = boxDecorationState; }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#undef ADD_BOOLEAN_BITFIELD
-
</del><span class="cx"> RenderObjectBitfields m_bitfields;
</span><span class="cx">
</span><del>- void setIsDragging(bool b) { m_bitfields.setIsDragging(b); }
- void setEverHadLayout(bool b) { m_bitfields.setEverHadLayout(b); }
</del><ins>+ class RenderObjectRareData {
+ public:
+ RenderObjectRareData()
+ : m_isDragging(false)
+ , m_hasReflection(false)
+ {
+ }
+
+ ADD_BOOLEAN_BITFIELD(isDragging, IsDragging);
+ ADD_BOOLEAN_BITFIELD(hasReflection, HasReflection);
+ };
+
+ RenderObjectRareData rareData() const;
+ RenderObjectRareData& ensureRareData();
+ void removeRareData();
+
+ // Note: RenderObjectRareData is stored by value.
+ typedef HashMap<const RenderObject*, RenderObjectRareData> RareDataHash;
+
+ static RareDataHash& rareDataMap();
+
+#undef ADD_BOOLEAN_BITFIELD
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline Frame& RenderObject::frame() const
</span></span></pre>
</div>
</div>
</body>
</html>