| 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-2013 Apple Inc. All rights reserved. | 5 * Copyright (C) 2003-2013 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 * Copyright (C) 2013 Google Inc. All rights reserved. | 7 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 8 * | 8 * |
| 9 * Redistribution and use in source and binary forms, with or without | 9 * Redistribution and use in source and binary forms, with or without |
| 10 * modification, are permitted provided that the following conditions are | 10 * modification, are permitted provided that the following conditions are |
| (...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 return adjustLogicalLeftOffsetForLine(logicalLeftFloatOffsetForLine(logi
calTop, fixedOffset, logicalHeight), applyTextIndent); | 318 return adjustLogicalLeftOffsetForLine(logicalLeftFloatOffsetForLine(logi
calTop, fixedOffset, logicalHeight), applyTextIndent); |
| 319 } | 319 } |
| 320 | 320 |
| 321 virtual LayoutObject* layoutSpecialExcludedChild(bool /*relayoutChildren*/,
SubtreeLayoutScope&); | 321 virtual LayoutObject* layoutSpecialExcludedChild(bool /*relayoutChildren*/,
SubtreeLayoutScope&); |
| 322 bool updateLogicalWidthAndColumnWidth() override; | 322 bool updateLogicalWidthAndColumnWidth() override; |
| 323 | 323 |
| 324 void setLogicalLeftForChild(LayoutBox& child, LayoutUnit logicalLeft); | 324 void setLogicalLeftForChild(LayoutBox& child, LayoutUnit logicalLeft); |
| 325 void setLogicalTopForChild(LayoutBox& child, LayoutUnit logicalTop); | 325 void setLogicalTopForChild(LayoutBox& child, LayoutUnit logicalTop); |
| 326 void determineLogicalLeftPositionForChild(LayoutBox& child); | 326 void determineLogicalLeftPositionForChild(LayoutBox& child); |
| 327 | 327 |
| 328 PaintInvalidationReason invalidatePaintIfNeeded(PaintInvalidationState&, con
st LayoutBoxModelObject& paintInvalidationContainer) override; |
| 329 |
| 328 private: | 330 private: |
| 329 bool layoutBlockFlow(bool relayoutChildren, LayoutUnit& pageLogicalHeight, S
ubtreeLayoutScope&); | 331 bool layoutBlockFlow(bool relayoutChildren, LayoutUnit& pageLogicalHeight, S
ubtreeLayoutScope&); |
| 330 void layoutBlockChildren(bool relayoutChildren, SubtreeLayoutScope&, LayoutU
nit beforeEdge, LayoutUnit afterEdge); | 332 void layoutBlockChildren(bool relayoutChildren, SubtreeLayoutScope&, LayoutU
nit beforeEdge, LayoutUnit afterEdge); |
| 331 | 333 |
| 332 void markDescendantsWithFloatsForLayoutIfNeeded(LayoutBlockFlow& child, Layo
utUnit newLogicalTop, LayoutUnit previousFloatLogicalBottom); | 334 void markDescendantsWithFloatsForLayoutIfNeeded(LayoutBlockFlow& child, Layo
utUnit newLogicalTop, LayoutUnit previousFloatLogicalBottom); |
| 333 bool positionAndLayoutOnceIfNeeded(LayoutBox& child, LayoutUnit newLogicalTo
p, LayoutUnit& previousFloatLogicalBottom); | 335 bool positionAndLayoutOnceIfNeeded(LayoutBox& child, LayoutUnit newLogicalTo
p, LayoutUnit& previousFloatLogicalBottom); |
| 334 void layoutBlockChild(LayoutBox& child, MarginInfo&, LayoutUnit& previousFlo
atLogicalBottom); | 336 void layoutBlockChild(LayoutBox& child, MarginInfo&, LayoutUnit& previousFlo
atLogicalBottom); |
| 335 void adjustPositionedBlock(LayoutBox& child, const MarginInfo&); | 337 void adjustPositionedBlock(LayoutBox& child, const MarginInfo&); |
| 336 void adjustFloatingBlock(const MarginInfo&); | 338 void adjustFloatingBlock(const MarginInfo&); |
| 337 | 339 |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 592 | 594 |
| 593 // END METHODS DEFINED IN LayoutBlockFlowLine | 595 // END METHODS DEFINED IN LayoutBlockFlowLine |
| 594 | 596 |
| 595 }; | 597 }; |
| 596 | 598 |
| 597 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); | 599 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); |
| 598 | 600 |
| 599 } // namespace blink | 601 } // namespace blink |
| 600 | 602 |
| 601 #endif // LayoutBlockFlow_h | 603 #endif // LayoutBlockFlow_h |
| OLD | NEW |