OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. | 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. |
4 * All right reserved. | 4 * All right reserved. |
5 * Copyright (C) 2010 Google Inc. All rights reserved. | 5 * Copyright (C) 2010 Google Inc. All rights 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 992 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1003 } | 1003 } |
1004 | 1004 |
1005 // Before restarting the layout loop with a new logicalHeight, remove all floats | 1005 // Before restarting the layout loop with a new logicalHeight, remove all floats |
1006 // that were added and reset the resolver. | 1006 // that were added and reset the resolver. |
1007 inline const InlineIterator& LayoutBlockFlow::restartLayoutRunsAndFloatsInRange( | 1007 inline const InlineIterator& LayoutBlockFlow::restartLayoutRunsAndFloatsInRange( |
1008 LayoutUnit oldLogicalHeight, | 1008 LayoutUnit oldLogicalHeight, |
1009 LayoutUnit newLogicalHeight, | 1009 LayoutUnit newLogicalHeight, |
1010 FloatingObject* lastFloatFromPreviousLine, | 1010 FloatingObject* lastFloatFromPreviousLine, |
1011 InlineBidiResolver& resolver, | 1011 InlineBidiResolver& resolver, |
1012 const InlineIterator& oldEnd) { | 1012 const InlineIterator& oldEnd) { |
1013 removeFloatingObjectsBelow(lastFloatFromPreviousLine, | 1013 removeFloatingObjectsBelow(lastFloatFromPreviousLine, oldLogicalHeight); |
1014 oldLogicalHeight.toInt()); | |
1015 setLogicalHeight(newLogicalHeight); | 1014 setLogicalHeight(newLogicalHeight); |
1016 resolver.setPositionIgnoringNestedIsolates(oldEnd); | 1015 resolver.setPositionIgnoringNestedIsolates(oldEnd); |
1017 return oldEnd; | 1016 return oldEnd; |
1018 } | 1017 } |
1019 | 1018 |
1020 void LayoutBlockFlow::appendFloatsToLastLine( | 1019 void LayoutBlockFlow::appendFloatsToLastLine( |
1021 LineLayoutState& layoutState, | 1020 LineLayoutState& layoutState, |
1022 const InlineIterator& cleanLineStart, | 1021 const InlineIterator& cleanLineStart, |
1023 const InlineBidiResolver& resolver, | 1022 const InlineBidiResolver& resolver, |
1024 const BidiStatus& cleanLineBidiStatus) { | 1023 const BidiStatus& cleanLineBidiStatus) { |
(...skipping 1486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2511 | 2510 |
2512 bool LayoutBlockFlow::paintedOutputOfObjectHasNoEffectRegardlessOfSize() const { | 2511 bool LayoutBlockFlow::paintedOutputOfObjectHasNoEffectRegardlessOfSize() const { |
2513 // LayoutBlockFlow is in charge of paint invalidation of the first line. | 2512 // LayoutBlockFlow is in charge of paint invalidation of the first line. |
2514 if (firstLineBox()) | 2513 if (firstLineBox()) |
2515 return false; | 2514 return false; |
2516 | 2515 |
2517 return LayoutBlock::paintedOutputOfObjectHasNoEffectRegardlessOfSize(); | 2516 return LayoutBlock::paintedOutputOfObjectHasNoEffectRegardlessOfSize(); |
2518 } | 2517 } |
2519 | 2518 |
2520 } // namespace blink | 2519 } // namespace blink |
OLD | NEW |