| 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 1628 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1639 bool RenderBlock::simplifiedLayout() | 1639 bool RenderBlock::simplifiedLayout() |
| 1640 { | 1640 { |
| 1641 if ((!posChildNeedsLayout() && !needsSimplifiedNormalFlowLayout()) || normal
ChildNeedsLayout() || selfNeedsLayout()) | 1641 if ((!posChildNeedsLayout() && !needsSimplifiedNormalFlowLayout()) || normal
ChildNeedsLayout() || selfNeedsLayout()) |
| 1642 return false; | 1642 return false; |
| 1643 | 1643 |
| 1644 LayoutStateMaintainer statePusher(*this, locationOffset()); | 1644 LayoutStateMaintainer statePusher(*this, locationOffset()); |
| 1645 | 1645 |
| 1646 if (needsPositionedMovementLayout() && !tryLayoutDoingPositionedMovementOnly
()) | 1646 if (needsPositionedMovementLayout() && !tryLayoutDoingPositionedMovementOnly
()) |
| 1647 return false; | 1647 return false; |
| 1648 | 1648 |
| 1649 FastTextAutosizer::LayoutScope fastTextAutosizerLayoutScope(document(), this
); | 1649 FastTextAutosizer::LayoutScope fastTextAutosizerLayoutScope(this); |
| 1650 | 1650 |
| 1651 // Lay out positioned descendants or objects that just need to recompute ove
rflow. | 1651 // Lay out positioned descendants or objects that just need to recompute ove
rflow. |
| 1652 if (needsSimplifiedNormalFlowLayout()) | 1652 if (needsSimplifiedNormalFlowLayout()) |
| 1653 simplifiedNormalFlowLayout(); | 1653 simplifiedNormalFlowLayout(); |
| 1654 | 1654 |
| 1655 // Make sure a forced break is applied after the content if we are a flow th
read in a simplified layout. | 1655 // Make sure a forced break is applied after the content if we are a flow th
read in a simplified layout. |
| 1656 // This ensures the size information is correctly computed for the last auto
-height region receiving content. | 1656 // This ensures the size information is correctly computed for the last auto
-height region receiving content. |
| 1657 if (isRenderFlowThread()) | 1657 if (isRenderFlowThread()) |
| 1658 toRenderFlowThread(this)->applyBreakAfterContent(clientLogicalBottom()); | 1658 toRenderFlowThread(this)->applyBreakAfterContent(clientLogicalBottom()); |
| 1659 | 1659 |
| (...skipping 3359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5019 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const | 5019 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const |
| 5020 { | 5020 { |
| 5021 showRenderObject(); | 5021 showRenderObject(); |
| 5022 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) | 5022 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) |
| 5023 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); | 5023 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); |
| 5024 } | 5024 } |
| 5025 | 5025 |
| 5026 #endif | 5026 #endif |
| 5027 | 5027 |
| 5028 } // namespace WebCore | 5028 } // namespace WebCore |
| OLD | NEW |