| 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 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 490 m_rareData->m_discardMarginBefore = false; | 490 m_rareData->m_discardMarginBefore = false; |
| 491 m_rareData->m_discardMarginAfter = false; | 491 m_rareData->m_discardMarginAfter = false; |
| 492 } | 492 } |
| 493 } | 493 } |
| 494 | 494 |
| 495 virtual void layout(); | 495 virtual void layout(); |
| 496 | 496 |
| 497 void layoutPositionedObjects(bool relayoutChildren, bool fixedPositionObject
sOnly = false); | 497 void layoutPositionedObjects(bool relayoutChildren, bool fixedPositionObject
sOnly = false); |
| 498 void markFixedPositionObjectForLayoutIfNeeded(RenderObject* child); | 498 void markFixedPositionObjectForLayoutIfNeeded(RenderObject* child); |
| 499 | 499 |
| 500 // FIXME: This should be pure virtual with an implementation in the header. |
| 501 virtual bool supportsPartialLayout() const OVERRIDE { return true; }; |
| 502 |
| 500 virtual void paint(PaintInfo&, const LayoutPoint&); | 503 virtual void paint(PaintInfo&, const LayoutPoint&); |
| 501 virtual void paintObject(PaintInfo&, const LayoutPoint&); | 504 virtual void paintObject(PaintInfo&, const LayoutPoint&); |
| 502 virtual void paintChildren(PaintInfo&, const LayoutPoint&); | 505 virtual void paintChildren(PaintInfo&, const LayoutPoint&); |
| 503 void paintChild(RenderBox*, PaintInfo&, const LayoutPoint&); | 506 void paintChild(RenderBox*, PaintInfo&, const LayoutPoint&); |
| 504 | 507 |
| 505 LayoutUnit logicalRightOffsetForLine(LayoutUnit logicalTop, LayoutUnit fixed
Offset, bool applyTextIndent, LayoutUnit* heightRemaining = 0, LayoutUnit logica
lHeight = 0) const | 508 LayoutUnit logicalRightOffsetForLine(LayoutUnit logicalTop, LayoutUnit fixed
Offset, bool applyTextIndent, LayoutUnit* heightRemaining = 0, LayoutUnit logica
lHeight = 0) const |
| 506 { | 509 { |
| 507 return adjustLogicalRightOffsetForLine(logicalRightFloatOffsetForLine(lo
gicalTop, fixedOffset, heightRemaining, logicalHeight, ShapeOutsideFloatShapeOff
set), applyTextIndent); | 510 return adjustLogicalRightOffsetForLine(logicalRightFloatOffsetForLine(lo
gicalTop, fixedOffset, heightRemaining, logicalHeight, ShapeOutsideFloatShapeOff
set), applyTextIndent); |
| 508 } | 511 } |
| 509 LayoutUnit logicalLeftOffsetForLine(LayoutUnit logicalTop, LayoutUnit fixedO
ffset, bool applyTextIndent, LayoutUnit* heightRemaining = 0, LayoutUnit logical
Height = 0) const | 512 LayoutUnit logicalLeftOffsetForLine(LayoutUnit logicalTop, LayoutUnit fixedO
ffset, bool applyTextIndent, LayoutUnit* heightRemaining = 0, LayoutUnit logical
Height = 0) const |
| (...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1347 static String string(const int value); | 1350 static String string(const int value); |
| 1348 }; | 1351 }; |
| 1349 template<> struct ValueToString<RenderBlock::FloatingObject*> { | 1352 template<> struct ValueToString<RenderBlock::FloatingObject*> { |
| 1350 static String string(const RenderBlock::FloatingObject*); | 1353 static String string(const RenderBlock::FloatingObject*); |
| 1351 }; | 1354 }; |
| 1352 #endif | 1355 #endif |
| 1353 | 1356 |
| 1354 } // namespace WebCore | 1357 } // namespace WebCore |
| 1355 | 1358 |
| 1356 #endif // RenderBlock_h | 1359 #endif // RenderBlock_h |
| OLD | NEW |