| 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 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 { | 352 { |
| 353 return moveChildrenTo(toBlock, firstChild(), 0, beforeChild, fullRemoveI
nsert); | 353 return moveChildrenTo(toBlock, firstChild(), 0, beforeChild, fullRemoveI
nsert); |
| 354 } | 354 } |
| 355 // Move all of the kids from |startChild| up to but excluding |endChild|. 0
can be passed as the endChild to denote | 355 // Move all of the kids from |startChild| up to but excluding |endChild|. 0
can be passed as the endChild to denote |
| 356 // that all the kids from |startChild| onwards should be added. | 356 // that all the kids from |startChild| onwards should be added. |
| 357 void moveChildrenTo(RenderBlock* toBlock, RenderObject* startChild, RenderOb
ject* endChild, bool fullRemoveInsert = false) | 357 void moveChildrenTo(RenderBlock* toBlock, RenderObject* startChild, RenderOb
ject* endChild, bool fullRemoveInsert = false) |
| 358 { | 358 { |
| 359 return moveChildrenTo(toBlock, startChild, endChild, 0, fullRemoveInsert
); | 359 return moveChildrenTo(toBlock, startChild, endChild, 0, fullRemoveInsert
); |
| 360 } | 360 } |
| 361 void moveChildrenTo(RenderBlock* toBlock, RenderObject* startChild, RenderOb
ject* endChild, RenderObject* beforeChild, bool fullRemoveInsert = false); | 361 void moveChildrenTo(RenderBlock* toBlock, RenderObject* startChild, RenderOb
ject* endChild, RenderObject* beforeChild, bool fullRemoveInsert = false); |
| 362 | 362 |
| 363 LayoutUnit maxPositiveMarginBefore() const { return m_rareData ? m_rareData-
>m_margins.positiveMarginBefore() : RenderBlockRareData::positiveMarginBeforeDef
ault(this); } | 363 LayoutUnit maxPositiveMarginBefore() const { return m_rareData ? m_rareData-
>m_margins.positiveMarginBefore() : RenderBlockRareData::positiveMarginBeforeDef
ault(this); } |
| 364 LayoutUnit maxNegativeMarginBefore() const { return m_rareData ? m_rareData-
>m_margins.negativeMarginBefore() : RenderBlockRareData::negativeMarginBeforeDef
ault(this); } | 364 LayoutUnit maxNegativeMarginBefore() const { return m_rareData ? m_rareData-
>m_margins.negativeMarginBefore() : RenderBlockRareData::negativeMarginBeforeDef
ault(this); } |
| 365 LayoutUnit maxPositiveMarginAfter() const { return m_rareData ? m_rareData->
m_margins.positiveMarginAfter() : RenderBlockRareData::positiveMarginAfterDefaul
t(this); } | 365 LayoutUnit maxPositiveMarginAfter() const { return m_rareData ? m_rareData->
m_margins.positiveMarginAfter() : RenderBlockRareData::positiveMarginAfterDefaul
t(this); } |
| 366 LayoutUnit maxNegativeMarginAfter() const { return m_rareData ? m_rareData->
m_margins.negativeMarginAfter() : RenderBlockRareData::negativeMarginAfterDefaul
t(this); } | 366 LayoutUnit maxNegativeMarginAfter() const { return m_rareData ? m_rareData->
m_margins.negativeMarginAfter() : RenderBlockRareData::negativeMarginAfterDefaul
t(this); } |
| 367 | 367 |
| 368 void setMaxMarginBeforeValues(LayoutUnit pos, LayoutUnit neg); | 368 void setMaxMarginBeforeValues(LayoutUnit pos, LayoutUnit neg); |
| 369 void setMaxMarginAfterValues(LayoutUnit pos, LayoutUnit neg); | 369 void setMaxMarginAfterValues(LayoutUnit pos, LayoutUnit neg); |
| 370 | 370 |
| 371 void initMaxMarginValues() | 371 void initMaxMarginValues() |
| 372 { | 372 { |
| (...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 775 | 775 |
| 776 virtual void calcColumnWidth(); | 776 virtual void calcColumnWidth(); |
| 777 bool layoutColumns(bool hasSpecifiedPageLogicalHeight, LayoutUnit pageLogica
lHeight, LayoutStateMaintainer&); | 777 bool layoutColumns(bool hasSpecifiedPageLogicalHeight, LayoutUnit pageLogica
lHeight, LayoutStateMaintainer&); |
| 778 void makeChildrenAnonymousColumnBlocks(RenderObject* beforeChild, RenderBloc
k* newBlockBox, RenderObject* newChild); | 778 void makeChildrenAnonymousColumnBlocks(RenderObject* beforeChild, RenderBloc
k* newBlockBox, RenderObject* newChild); |
| 779 | 779 |
| 780 bool expandsToEncloseOverhangingFloats() const; | 780 bool expandsToEncloseOverhangingFloats() const; |
| 781 | 781 |
| 782 void updateScrollInfoAfterLayout(); | 782 void updateScrollInfoAfterLayout(); |
| 783 | 783 |
| 784 RenderObject* splitAnonymousBlocksAroundChild(RenderObject* beforeChild); | 784 RenderObject* splitAnonymousBlocksAroundChild(RenderObject* beforeChild); |
| 785 RenderObject* splitTablePartsAroundChild(RenderObject* beforeChild); |
| 785 void splitBlocks(RenderBlock* fromBlock, RenderBlock* toBlock, RenderBlock*
middleBlock, | 786 void splitBlocks(RenderBlock* fromBlock, RenderBlock* toBlock, RenderBlock*
middleBlock, |
| 786 RenderObject* beforeChild, RenderBoxModelObject* oldCont); | 787 RenderObject* beforeChild, RenderBoxModelObject* oldCont); |
| 787 void splitFlow(RenderObject* beforeChild, RenderBlock* newBlockBox, | 788 void splitFlow(RenderObject* beforeChild, RenderBlock* newBlockBox, |
| 788 RenderObject* newChild, RenderBoxModelObject* oldCont); | 789 RenderObject* newChild, RenderBoxModelObject* oldCont); |
| 789 RenderBlock* clone() const; | 790 RenderBlock* clone() const; |
| 790 RenderBlock* continuationBefore(RenderObject* beforeChild); | 791 RenderBlock* continuationBefore(RenderObject* beforeChild); |
| 791 RenderBlock* containingColumnsBlock(bool allowAnonymousColumnBlock = true); | 792 RenderBlock* containingColumnsBlock(bool allowAnonymousColumnBlock = true); |
| 792 RenderBlock* columnsBlockForSpanningElement(RenderObject* newChild); | 793 RenderBlock* columnsBlockForSpanningElement(RenderObject* newChild); |
| 793 | 794 |
| 794 class MarginInfo { | 795 class MarginInfo { |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1081 static String string(const int value); | 1082 static String string(const int value); |
| 1082 }; | 1083 }; |
| 1083 template<> struct ValueToString<RenderBlock::FloatingObject*> { | 1084 template<> struct ValueToString<RenderBlock::FloatingObject*> { |
| 1084 static String string(const RenderBlock::FloatingObject*); | 1085 static String string(const RenderBlock::FloatingObject*); |
| 1085 }; | 1086 }; |
| 1086 #endif | 1087 #endif |
| 1087 | 1088 |
| 1088 } // namespace WebCore | 1089 } // namespace WebCore |
| 1089 | 1090 |
| 1090 #endif // RenderBlock_h | 1091 #endif // RenderBlock_h |
| OLD | NEW |