| 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 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 { | 363 { |
| 364 return moveChildrenTo(toBlock, firstChild(), 0, beforeChild, fullRemoveI
nsert); | 364 return moveChildrenTo(toBlock, firstChild(), 0, beforeChild, fullRemoveI
nsert); |
| 365 } | 365 } |
| 366 // Move all of the kids from |startChild| up to but excluding |endChild|. 0
can be passed as the endChild to denote | 366 // Move all of the kids from |startChild| up to but excluding |endChild|. 0
can be passed as the endChild to denote |
| 367 // that all the kids from |startChild| onwards should be added. | 367 // that all the kids from |startChild| onwards should be added. |
| 368 void moveChildrenTo(RenderBlock* toBlock, RenderObject* startChild, RenderOb
ject* endChild, bool fullRemoveInsert = false) | 368 void moveChildrenTo(RenderBlock* toBlock, RenderObject* startChild, RenderOb
ject* endChild, bool fullRemoveInsert = false) |
| 369 { | 369 { |
| 370 return moveChildrenTo(toBlock, startChild, endChild, 0, fullRemoveInsert
); | 370 return moveChildrenTo(toBlock, startChild, endChild, 0, fullRemoveInsert
); |
| 371 } | 371 } |
| 372 void moveChildrenTo(RenderBlock* toBlock, RenderObject* startChild, RenderOb
ject* endChild, RenderObject* beforeChild, bool fullRemoveInsert = false); | 372 void moveChildrenTo(RenderBlock* toBlock, RenderObject* startChild, RenderOb
ject* endChild, RenderObject* beforeChild, bool fullRemoveInsert = false); |
| 373 | 373 |
| 374 LayoutUnit maxPositiveMarginBefore() const { return m_rareData ? m_rareData-
>m_margins.positiveMarginBefore() : RenderBlockRareData::positiveMarginBeforeDef
ault(this); } | 374 LayoutUnit maxPositiveMarginBefore() const { return m_rareData ? m_rareData-
>m_margins.positiveMarginBefore() : RenderBlockRareData::positiveMarginBeforeDef
ault(this); } |
| 375 LayoutUnit maxNegativeMarginBefore() const { return m_rareData ? m_rareData-
>m_margins.negativeMarginBefore() : RenderBlockRareData::negativeMarginBeforeDef
ault(this); } | 375 LayoutUnit maxNegativeMarginBefore() const { return m_rareData ? m_rareData-
>m_margins.negativeMarginBefore() : RenderBlockRareData::negativeMarginBeforeDef
ault(this); } |
| 376 LayoutUnit maxPositiveMarginAfter() const { return m_rareData ? m_rareData->
m_margins.positiveMarginAfter() : RenderBlockRareData::positiveMarginAfterDefaul
t(this); } | 376 LayoutUnit maxPositiveMarginAfter() const { return m_rareData ? m_rareData->
m_margins.positiveMarginAfter() : RenderBlockRareData::positiveMarginAfterDefaul
t(this); } |
| 377 LayoutUnit maxNegativeMarginAfter() const { return m_rareData ? m_rareData->
m_margins.negativeMarginAfter() : RenderBlockRareData::negativeMarginAfterDefaul
t(this); } | 377 LayoutUnit maxNegativeMarginAfter() const { return m_rareData ? m_rareData->
m_margins.negativeMarginAfter() : RenderBlockRareData::negativeMarginAfterDefaul
t(this); } |
| 378 | 378 |
| 379 void setMaxMarginBeforeValues(LayoutUnit pos, LayoutUnit neg); | 379 void setMaxMarginBeforeValues(LayoutUnit pos, LayoutUnit neg); |
| 380 void setMaxMarginAfterValues(LayoutUnit pos, LayoutUnit neg); | 380 void setMaxMarginAfterValues(LayoutUnit pos, LayoutUnit neg); |
| 381 | 381 |
| 382 void initMaxMarginValues() | 382 void initMaxMarginValues() |
| 383 { | 383 { |
| (...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 790 | 790 |
| 791 virtual void calcColumnWidth(); | 791 virtual void calcColumnWidth(); |
| 792 bool layoutColumns(bool hasSpecifiedPageLogicalHeight, LayoutUnit pageLogica
lHeight, LayoutStateMaintainer&); | 792 bool layoutColumns(bool hasSpecifiedPageLogicalHeight, LayoutUnit pageLogica
lHeight, LayoutStateMaintainer&); |
| 793 void makeChildrenAnonymousColumnBlocks(RenderObject* beforeChild, RenderBloc
k* newBlockBox, RenderObject* newChild); | 793 void makeChildrenAnonymousColumnBlocks(RenderObject* beforeChild, RenderBloc
k* newBlockBox, RenderObject* newChild); |
| 794 | 794 |
| 795 bool expandsToEncloseOverhangingFloats() const; | 795 bool expandsToEncloseOverhangingFloats() const; |
| 796 | 796 |
| 797 void updateScrollInfoAfterLayout(); | 797 void updateScrollInfoAfterLayout(); |
| 798 | 798 |
| 799 RenderObject* splitAnonymousBlocksAroundChild(RenderObject* beforeChild); | 799 RenderObject* splitAnonymousBlocksAroundChild(RenderObject* beforeChild); |
| 800 RenderObject* splitTablePartsAroundChild(RenderObject* beforeChild); |
| 800 void splitBlocks(RenderBlock* fromBlock, RenderBlock* toBlock, RenderBlock*
middleBlock, | 801 void splitBlocks(RenderBlock* fromBlock, RenderBlock* toBlock, RenderBlock*
middleBlock, |
| 801 RenderObject* beforeChild, RenderBoxModelObject* oldCont); | 802 RenderObject* beforeChild, RenderBoxModelObject* oldCont); |
| 802 void splitFlow(RenderObject* beforeChild, RenderBlock* newBlockBox, | 803 void splitFlow(RenderObject* beforeChild, RenderBlock* newBlockBox, |
| 803 RenderObject* newChild, RenderBoxModelObject* oldCont); | 804 RenderObject* newChild, RenderBoxModelObject* oldCont); |
| 804 RenderBlock* clone() const; | 805 RenderBlock* clone() const; |
| 805 RenderBlock* continuationBefore(RenderObject* beforeChild); | 806 RenderBlock* continuationBefore(RenderObject* beforeChild); |
| 806 RenderBlock* containingColumnsBlock(bool allowAnonymousColumnBlock = true); | 807 RenderBlock* containingColumnsBlock(bool allowAnonymousColumnBlock = true); |
| 807 RenderBlock* columnsBlockForSpanningElement(RenderObject* newChild); | 808 RenderBlock* columnsBlockForSpanningElement(RenderObject* newChild); |
| 808 | 809 |
| 809 class MarginInfo { | 810 class MarginInfo { |
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1106 static String string(const int value); | 1107 static String string(const int value); |
| 1107 }; | 1108 }; |
| 1108 template<> struct ValueToString<RenderBlock::FloatingObject*> { | 1109 template<> struct ValueToString<RenderBlock::FloatingObject*> { |
| 1109 static String string(const RenderBlock::FloatingObject*); | 1110 static String string(const RenderBlock::FloatingObject*); |
| 1110 }; | 1111 }; |
| 1111 #endif | 1112 #endif |
| 1112 | 1113 |
| 1113 } // namespace WebCore | 1114 } // namespace WebCore |
| 1114 | 1115 |
| 1115 #endif // RenderBlock_h | 1116 #endif // RenderBlock_h |
| OLD | NEW |