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 1589 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1600 // FIXME: We could do better here by computing a temporary overflow obje
ct from layoutPositionedObjects and only | 1600 // FIXME: We could do better here by computing a temporary overflow obje
ct from layoutPositionedObjects and only |
1601 // updating our overflow if we either used to have overflow or if the ne
w temporary object has overflow. | 1601 // updating our overflow if we either used to have overflow or if the ne
w temporary object has overflow. |
1602 // For now just always recompute overflow. This is no worse performance-
wise than the old code that called rightmostPosition and | 1602 // For now just always recompute overflow. This is no worse performance-
wise than the old code that called rightmostPosition and |
1603 // lowestPosition on every relayout so it's not a regression. | 1603 // lowestPosition on every relayout so it's not a regression. |
1604 // computeOverflow expects the bottom edge before we clamp our height. S
ince this information isn't available during | 1604 // computeOverflow expects the bottom edge before we clamp our height. S
ince this information isn't available during |
1605 // simplifiedLayout, we cache the value in m_overflow. | 1605 // simplifiedLayout, we cache the value in m_overflow. |
1606 LayoutUnit oldClientAfterEdge = hasRenderOverflow() ? m_overflow->layout
ClientAfterEdge() : clientLogicalBottom(); | 1606 LayoutUnit oldClientAfterEdge = hasRenderOverflow() ? m_overflow->layout
ClientAfterEdge() : clientLogicalBottom(); |
1607 computeOverflow(oldClientAfterEdge, true); | 1607 computeOverflow(oldClientAfterEdge, true); |
1608 } | 1608 } |
1609 | 1609 |
1610 updateLayerTransform(); | 1610 updateLayerTransformAfterLayout(); |
1611 | 1611 |
1612 updateScrollInfoAfterLayout(); | 1612 updateScrollInfoAfterLayout(); |
1613 | 1613 |
1614 clearNeedsLayout(); | 1614 clearNeedsLayout(); |
1615 return true; | 1615 return true; |
1616 } | 1616 } |
1617 | 1617 |
1618 void RenderBlock::markFixedPositionObjectForLayoutIfNeeded(RenderObject* child,
SubtreeLayoutScope& layoutScope) | 1618 void RenderBlock::markFixedPositionObjectForLayoutIfNeeded(RenderObject* child,
SubtreeLayoutScope& layoutScope) |
1619 { | 1619 { |
1620 if (child->style()->position() != FixedPosition) | 1620 if (child->style()->position() != FixedPosition) |
(...skipping 3426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5047 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const | 5047 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const |
5048 { | 5048 { |
5049 showRenderObject(); | 5049 showRenderObject(); |
5050 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) | 5050 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) |
5051 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); | 5051 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); |
5052 } | 5052 } |
5053 | 5053 |
5054 #endif | 5054 #endif |
5055 | 5055 |
5056 } // namespace WebCore | 5056 } // namespace WebCore |
OLD | NEW |