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) 2005 Allan Sandfeld Jensen (kde@carewolf.com) | 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) |
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) |
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. |
7 * All rights reserved. | 7 * All rights reserved. |
8 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. | 8 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. |
9 * | 9 * |
10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
(...skipping 4682 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4693 return true; | 4693 return true; |
4694 } | 4694 } |
4695 return false; | 4695 return false; |
4696 } | 4696 } |
4697 | 4697 |
4698 void LayoutBox::markChildForPaginationRelayoutIfNeeded( | 4698 void LayoutBox::markChildForPaginationRelayoutIfNeeded( |
4699 LayoutBox& child, | 4699 LayoutBox& child, |
4700 SubtreeLayoutScope& layoutScope) { | 4700 SubtreeLayoutScope& layoutScope) { |
4701 DCHECK(!child.needsLayout()); | 4701 DCHECK(!child.needsLayout()); |
4702 LayoutState* layoutState = view()->layoutState(); | 4702 LayoutState* layoutState = view()->layoutState(); |
| 4703 if (layoutState->paginationStateChanged()) { |
| 4704 layoutScope.setChildNeedsLayout(&child); |
| 4705 return; |
| 4706 } |
4703 if (!layoutState->isPaginated()) | 4707 if (!layoutState->isPaginated()) |
4704 return; | 4708 return; |
4705 | 4709 |
4706 if (layoutState->pageLogicalHeightChanged() || | 4710 if (layoutState->pageLogicalHeightChanged() || |
4707 (layoutState->pageLogicalHeight() && | 4711 (layoutState->pageLogicalHeight() && |
4708 layoutState->pageLogicalOffset(child, child.logicalTop()) != | 4712 layoutState->pageLogicalOffset(child, child.logicalTop()) != |
4709 child.pageLogicalOffset())) | 4713 child.pageLogicalOffset())) |
4710 layoutScope.setChildNeedsLayout(&child); | 4714 layoutScope.setChildNeedsLayout(&child); |
4711 } | 4715 } |
4712 | 4716 |
(...skipping 873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5586 LayoutRect rect = frameRect(); | 5590 LayoutRect rect = frameRect(); |
5587 | 5591 |
5588 LayoutBlock* block = containingBlock(); | 5592 LayoutBlock* block = containingBlock(); |
5589 if (block) | 5593 if (block) |
5590 block->adjustChildDebugRect(rect); | 5594 block->adjustChildDebugRect(rect); |
5591 | 5595 |
5592 return rect; | 5596 return rect; |
5593 } | 5597 } |
5594 | 5598 |
5595 } // namespace blink | 5599 } // namespace blink |
OLD | NEW |