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, 2011 Apple Inc.
All rights reserved. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. |
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
(...skipping 1477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1488 | 1488 |
1489 // Fixed positioned elements don't contribute to layout overflow, since
they don't scroll with the content. | 1489 // Fixed positioned elements don't contribute to layout overflow, since
they don't scroll with the content. |
1490 if (positionedObject->style()->position() != FixedPosition) | 1490 if (positionedObject->style()->position() != FixedPosition) |
1491 addOverflowFromChild(positionedObject); | 1491 addOverflowFromChild(positionedObject); |
1492 } | 1492 } |
1493 } | 1493 } |
1494 | 1494 |
1495 bool RenderBlock::expandsToEncloseOverhangingFloats() const | 1495 bool RenderBlock::expandsToEncloseOverhangingFloats() const |
1496 { | 1496 { |
1497 return isInlineBlockOrInlineTable() || isFloatingOrPositioned() || hasOverfl
owClip() || (parent() && parent()->isDeprecatedFlexibleBox()) | 1497 return isInlineBlockOrInlineTable() || isFloatingOrPositioned() || hasOverfl
owClip() || (parent() && parent()->isDeprecatedFlexibleBox()) |
1498 || hasColumns() || isTableCell() || isFieldset() || isWritingModeRoot
() || isRoot(); | 1498 || hasColumns() || isTableCell() || isTableCaption() || isFieldset()
|| isWritingModeRoot() || isRoot(); |
1499 } | 1499 } |
1500 | 1500 |
1501 void RenderBlock::adjustPositionedBlock(RenderBox* child, const MarginInfo& marg
inInfo) | 1501 void RenderBlock::adjustPositionedBlock(RenderBox* child, const MarginInfo& marg
inInfo) |
1502 { | 1502 { |
1503 bool isHorizontal = isHorizontalWritingMode(); | 1503 bool isHorizontal = isHorizontalWritingMode(); |
1504 bool hasStaticBlockPosition = child->style()->hasStaticBlockPosition(isHoriz
ontal); | 1504 bool hasStaticBlockPosition = child->style()->hasStaticBlockPosition(isHoriz
ontal); |
1505 | 1505 |
1506 LayoutUnit logicalTop = logicalHeight(); | 1506 LayoutUnit logicalTop = logicalHeight(); |
1507 setStaticInlinePositionForChild(child, logicalTop, startOffsetForContent(log
icalTop)); | 1507 setStaticInlinePositionForChild(child, logicalTop, startOffsetForContent(log
icalTop)); |
1508 | 1508 |
(...skipping 5535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
7044 } | 7044 } |
7045 | 7045 |
7046 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl
oatingObject* floatingObject) | 7046 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl
oatingObject* floatingObject) |
7047 { | 7047 { |
7048 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x(
), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY()); | 7048 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x(
), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY()); |
7049 } | 7049 } |
7050 | 7050 |
7051 #endif | 7051 #endif |
7052 | 7052 |
7053 } // namespace WebCore | 7053 } // namespace WebCore |
OLD | NEW |