| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2007 David Smith (catfish.man@gmail.com) | 4 * (C) 2007 David Smith (catfish.man@gmail.com) |
| 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r
ights reserved. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r
ights reserved. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 524 int m_lineBreakToAvoidWidow : 31; | 524 int m_lineBreakToAvoidWidow : 31; |
| 525 unsigned m_didBreakAtLineToAvoidWidow : 1; | 525 unsigned m_didBreakAtLineToAvoidWidow : 1; |
| 526 }; | 526 }; |
| 527 | 527 |
| 528 protected: | 528 protected: |
| 529 OwnPtr<RenderBlockRareData> m_rareData; | 529 OwnPtr<RenderBlockRareData> m_rareData; |
| 530 | 530 |
| 531 RenderObjectChildList m_children; | 531 RenderObjectChildList m_children; |
| 532 RenderLineBoxList m_lineBoxes; // All of the root line boxes created for t
his block flow. For example, <div>Hello<br>world.</div> will have two total lin
es for the <div>. | 532 RenderLineBoxList m_lineBoxes; // All of the root line boxes created for t
his block flow. For example, <div>Hello<br>world.</div> will have two total lin
es for the <div>. |
| 533 | 533 |
| 534 mutable signed m_lineHeight : 26; | 534 mutable signed m_lineHeight : 25; |
| 535 unsigned m_hasMarginBeforeQuirk : 1; // Note these quirk values can't be put
in RenderBlockRareData since they are set too frequently. | 535 unsigned m_hasMarginBeforeQuirk : 1; // Note these quirk values can't be put
in RenderBlockRareData since they are set too frequently. |
| 536 unsigned m_hasMarginAfterQuirk : 1; | 536 unsigned m_hasMarginAfterQuirk : 1; |
| 537 unsigned m_beingDestroyed : 1; | 537 unsigned m_beingDestroyed : 1; |
| 538 unsigned m_hasMarkupTruncation : 1; | 538 unsigned m_hasMarkupTruncation : 1; |
| 539 unsigned m_hasBorderOrPaddingLogicalWidthChanged : 1; | 539 unsigned m_hasBorderOrPaddingLogicalWidthChanged : 1; |
| 540 mutable unsigned m_hasOnlySelfCollapsingChildren : 1; | 540 mutable unsigned m_hasOnlySelfCollapsingChildren : 1; |
| 541 mutable unsigned m_descendantsWithFloatsMarkedForLayout : 1; |
| 541 | 542 |
| 542 // RenderRubyBase objects need to be able to split and merge, moving their c
hildren around | 543 // RenderRubyBase objects need to be able to split and merge, moving their c
hildren around |
| 543 // (calling moveChildTo, moveAllChildrenTo, and makeChildrenNonInline). | 544 // (calling moveChildTo, moveAllChildrenTo, and makeChildrenNonInline). |
| 544 friend class RenderRubyBase; | 545 friend class RenderRubyBase; |
| 545 // FIXME-BLOCKFLOW: Remove this when the line layout stuff has all moved out
of RenderBlock | 546 // FIXME-BLOCKFLOW: Remove this when the line layout stuff has all moved out
of RenderBlock |
| 546 friend class LineBreaker; | 547 friend class LineBreaker; |
| 547 | 548 |
| 548 // FIXME: This is temporary as we move code that accesses block flow | 549 // FIXME: This is temporary as we move code that accesses block flow |
| 549 // member variables out of RenderBlock and into RenderBlockFlow. | 550 // member variables out of RenderBlock and into RenderBlockFlow. |
| 550 friend class RenderBlockFlow; | 551 friend class RenderBlockFlow; |
| 551 }; | 552 }; |
| 552 | 553 |
| 553 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); | 554 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); |
| 554 | 555 |
| 555 } // namespace WebCore | 556 } // namespace WebCore |
| 556 | 557 |
| 557 #endif // RenderBlock_h | 558 #endif // RenderBlock_h |
| OLD | NEW |