diff options
| author | Steve Block <steveblock@google.com> | 2011-02-17 09:06:39 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-17 09:06:39 -0800 |
| commit | 7aed021d3442e74aedc738192c55d8978b2d9643 (patch) | |
| tree | 7801e8554b642ef58b280135c847003f833bb70e /WebCore/rendering/RenderBlock.h | |
| parent | 990373e4c55ba4f0312b5ab7974388d717d1907c (diff) | |
| parent | f7f6d6409be37f76dc308902285d24806dc87ef2 (diff) | |
| download | external_webkit-7aed021d3442e74aedc738192c55d8978b2d9643.zip external_webkit-7aed021d3442e74aedc738192c55d8978b2d9643.tar.gz external_webkit-7aed021d3442e74aedc738192c55d8978b2d9643.tar.bz2 | |
Merge "Merge WebKit at Chromium 9.0.597.106: Initial merge by Git"
Diffstat (limited to 'WebCore/rendering/RenderBlock.h')
| -rw-r--r-- | WebCore/rendering/RenderBlock.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderBlock.h b/WebCore/rendering/RenderBlock.h index 5153218..cc06954 100644 --- a/WebCore/rendering/RenderBlock.h +++ b/WebCore/rendering/RenderBlock.h @@ -55,6 +55,7 @@ public: RenderObjectChildList* children() { return &m_children; } virtual void destroy(); + bool beingDestroyed() const { return m_beingDestroyed; } // These two functions are overridden for inline-block. virtual int lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const; @@ -717,7 +718,8 @@ private: RenderObjectChildList m_children; RenderLineBoxList m_lineBoxes; // All of the root line boxes created for this block flow. For example, <div>Hello<br>world.</div> will have two total lines for the <div>. - mutable int m_lineHeight; + mutable int m_lineHeight : 31; + bool m_beingDestroyed : 1; // RenderRubyBase objects need to be able to split and merge, moving their children around // (calling moveChildTo, moveAllChildrenTo, and makeChildrenNonInline). |