| 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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 void determineLogicalLeftPositionForChild(RenderBox* child); | 156 void determineLogicalLeftPositionForChild(RenderBox* child); |
| 157 | 157 |
| 158 private: | 158 private: |
| 159 bool layoutBlockFlow(bool relayoutChildren, SubtreeLayoutScope&); | 159 bool layoutBlockFlow(bool relayoutChildren, SubtreeLayoutScope&); |
| 160 void layoutBlockChildren(bool relayoutChildren, SubtreeLayoutScope&, LayoutU
nit beforeEdge, LayoutUnit afterEdge); | 160 void layoutBlockChildren(bool relayoutChildren, SubtreeLayoutScope&, LayoutU
nit beforeEdge, LayoutUnit afterEdge); |
| 161 | 161 |
| 162 void layoutBlockChild(RenderBox* child, MarginInfo&, LayoutUnit& previousFlo
atLogicalBottom); | 162 void layoutBlockChild(RenderBox* child, MarginInfo&, LayoutUnit& previousFlo
atLogicalBottom); |
| 163 void adjustPositionedBlock(RenderBox* child, const MarginInfo&); | 163 void adjustPositionedBlock(RenderBox* child, const MarginInfo&); |
| 164 void adjustFloatingBlock(const MarginInfo&); | 164 void adjustFloatingBlock(const MarginInfo&); |
| 165 | 165 |
| 166 LayoutPoint flipFloatForWritingModeForChild(const FloatingObject*, const Lay
outPoint&) const; | |
| 167 | |
| 168 LayoutPoint computeLogicalLocationForFloat(const FloatingObject*, LayoutUnit
logicalTopOffset) const; | 166 LayoutPoint computeLogicalLocationForFloat(const FloatingObject*, LayoutUnit
logicalTopOffset) const; |
| 169 | 167 |
| 170 // Called from lineWidth, to position the floats added in the last line. | 168 // Called from lineWidth, to position the floats added in the last line. |
| 171 // Returns true if and only if it has positioned any floats. | 169 // Returns true if and only if it has positioned any floats. |
| 172 bool positionNewFloats(); | 170 bool positionNewFloats(); |
| 173 | 171 |
| 174 LayoutUnit getClearDelta(RenderBox* child, LayoutUnit yPos); | 172 LayoutUnit getClearDelta(RenderBox* child, LayoutUnit yPos); |
| 175 | 173 |
| 176 bool hasOverhangingFloats() { return parent() && containsFloats() && lowestF
loatLogicalBottom() > logicalHeight(); } | 174 bool hasOverhangingFloats() { return parent() && containsFloats() && lowestF
loatLogicalBottom() > logicalHeight(); } |
| 177 bool hasOverhangingFloat(RenderBox*); | 175 bool hasOverhangingFloat(RenderBox*); |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 385 | 383 |
| 386 // END METHODS DEFINED IN RenderBlockLineLayout | 384 // END METHODS DEFINED IN RenderBlockLineLayout |
| 387 | 385 |
| 388 }; | 386 }; |
| 389 | 387 |
| 390 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow()); | 388 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow()); |
| 391 | 389 |
| 392 } // namespace blink | 390 } // namespace blink |
| 393 | 391 |
| 394 #endif // RenderBlockFlow_h | 392 #endif // RenderBlockFlow_h |
| OLD | NEW |