| 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 static void clearPercentHeightDescendantsFrom(RenderBox*); | 119 static void clearPercentHeightDescendantsFrom(RenderBox*); |
| 120 static void removePercentHeightDescendantIfNeeded(RenderBox*); | 120 static void removePercentHeightDescendantIfNeeded(RenderBox*); |
| 121 | 121 |
| 122 TrackedRendererListHashSet* percentHeightDescendants() const; | 122 TrackedRendererListHashSet* percentHeightDescendants() const; |
| 123 bool hasPercentHeightDescendants() const | 123 bool hasPercentHeightDescendants() const |
| 124 { | 124 { |
| 125 TrackedRendererListHashSet* descendants = percentHeightDescendants(); | 125 TrackedRendererListHashSet* descendants = percentHeightDescendants(); |
| 126 return descendants && !descendants->isEmpty(); | 126 return descendants && !descendants->isEmpty(); |
| 127 } | 127 } |
| 128 | 128 |
| 129 void notifyScrollbarThicknessChanged() { m_widthAvailableToChildrenChanged =
true; } |
| 130 |
| 129 void setHasMarkupTruncation(bool b) { m_hasMarkupTruncation = b; } | 131 void setHasMarkupTruncation(bool b) { m_hasMarkupTruncation = b; } |
| 130 bool hasMarkupTruncation() const { return m_hasMarkupTruncation; } | 132 bool hasMarkupTruncation() const { return m_hasMarkupTruncation; } |
| 131 | 133 |
| 132 void setHasMarginBeforeQuirk(bool b) { m_hasMarginBeforeQuirk = b; } | 134 void setHasMarginBeforeQuirk(bool b) { m_hasMarginBeforeQuirk = b; } |
| 133 void setHasMarginAfterQuirk(bool b) { m_hasMarginAfterQuirk = b; } | 135 void setHasMarginAfterQuirk(bool b) { m_hasMarginAfterQuirk = b; } |
| 134 | 136 |
| 135 bool hasMarginBeforeQuirk() const { return m_hasMarginBeforeQuirk; } | 137 bool hasMarginBeforeQuirk() const { return m_hasMarginBeforeQuirk; } |
| 136 bool hasMarginAfterQuirk() const { return m_hasMarginAfterQuirk; } | 138 bool hasMarginAfterQuirk() const { return m_hasMarginAfterQuirk; } |
| 137 | 139 |
| 138 bool hasMarginBeforeQuirk(const RenderBox* child) const; | 140 bool hasMarginBeforeQuirk(const RenderBox* child) const; |
| (...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 474 protected: | 476 protected: |
| 475 RenderObjectChildList m_children; | 477 RenderObjectChildList m_children; |
| 476 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>. | 478 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>. |
| 477 | 479 |
| 478 LayoutUnit m_pageLogicalOffset; | 480 LayoutUnit m_pageLogicalOffset; |
| 479 | 481 |
| 480 unsigned m_hasMarginBeforeQuirk : 1; // Note these quirk values can't be put
in RenderBlockRareData since they are set too frequently. | 482 unsigned m_hasMarginBeforeQuirk : 1; // Note these quirk values can't be put
in RenderBlockRareData since they are set too frequently. |
| 481 unsigned m_hasMarginAfterQuirk : 1; | 483 unsigned m_hasMarginAfterQuirk : 1; |
| 482 unsigned m_beingDestroyed : 1; | 484 unsigned m_beingDestroyed : 1; |
| 483 unsigned m_hasMarkupTruncation : 1; | 485 unsigned m_hasMarkupTruncation : 1; |
| 484 unsigned m_hasBorderOrPaddingLogicalWidthChanged : 1; | 486 unsigned m_widthAvailableToChildrenChanged : 1; |
| 485 mutable unsigned m_hasOnlySelfCollapsingChildren : 1; | 487 mutable unsigned m_hasOnlySelfCollapsingChildren : 1; |
| 486 mutable unsigned m_descendantsWithFloatsMarkedForLayout : 1; | 488 mutable unsigned m_descendantsWithFloatsMarkedForLayout : 1; |
| 487 | 489 |
| 488 // RenderRubyBase objects need to be able to split and merge, moving their c
hildren around | 490 // RenderRubyBase objects need to be able to split and merge, moving their c
hildren around |
| 489 // (calling moveChildTo, moveAllChildrenTo, and makeChildrenNonInline). | 491 // (calling moveChildTo, moveAllChildrenTo, and makeChildrenNonInline). |
| 490 friend class RenderRubyBase; | 492 friend class RenderRubyBase; |
| 491 // FIXME-BLOCKFLOW: Remove this when the line layout stuff has all moved out
of RenderBlock | 493 // FIXME-BLOCKFLOW: Remove this when the line layout stuff has all moved out
of RenderBlock |
| 492 friend class LineBreaker; | 494 friend class LineBreaker; |
| 493 | 495 |
| 494 // FIXME: This is temporary as we move code that accesses block flow | 496 // FIXME: This is temporary as we move code that accesses block flow |
| 495 // member variables out of RenderBlock and into RenderBlockFlow. | 497 // member variables out of RenderBlock and into RenderBlockFlow. |
| 496 friend class RenderBlockFlow; | 498 friend class RenderBlockFlow; |
| 497 }; | 499 }; |
| 498 | 500 |
| 499 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); | 501 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); |
| 500 | 502 |
| 501 } // namespace blink | 503 } // namespace blink |
| 502 | 504 |
| 503 #endif // RenderBlock_h | 505 #endif // RenderBlock_h |
| OLD | NEW |