| 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 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 | 285 |
| 286 bool positionNewFloatOnLine(FloatingObject& newFloat, FloatingObject* lastFl
oatFromPreviousLine, LineInfo&, LineWidth&); | 286 bool positionNewFloatOnLine(FloatingObject& newFloat, FloatingObject* lastFl
oatFromPreviousLine, LineInfo&, LineWidth&); |
| 287 | 287 |
| 288 LayoutUnit nextFloatLogicalBottomBelow(LayoutUnit, ShapeOutsideFloatOffsetMo
de = ShapeOutsideFloatMarginBoxOffset) const; | 288 LayoutUnit nextFloatLogicalBottomBelow(LayoutUnit, ShapeOutsideFloatOffsetMo
de = ShapeOutsideFloatMarginBoxOffset) const; |
| 289 | 289 |
| 290 FloatingObject* lastFloatFromPreviousLine() const | 290 FloatingObject* lastFloatFromPreviousLine() const |
| 291 { | 291 { |
| 292 return containsFloats() ? m_floatingObjects->set().last().get() : nullpt
r; | 292 return containsFloats() ? m_floatingObjects->set().last().get() : nullpt
r; |
| 293 } | 293 } |
| 294 | 294 |
| 295 void invalidateDisplayItemClientsOfFirstLine(); |
| 296 |
| 295 protected: | 297 protected: |
| 296 void rebuildFloatsFromIntruding(); | 298 void rebuildFloatsFromIntruding(); |
| 297 void layoutInlineChildren(bool relayoutChildren, LayoutUnit& paintInvalidati
onLogicalTop, LayoutUnit& paintInvalidationLogicalBottom, LayoutUnit afterEdge); | 299 void layoutInlineChildren(bool relayoutChildren, LayoutUnit& paintInvalidati
onLogicalTop, LayoutUnit& paintInvalidationLogicalBottom, LayoutUnit afterEdge); |
| 298 void addLowestFloatFromChildren(LayoutBlockFlow*); | 300 void addLowestFloatFromChildren(LayoutBlockFlow*); |
| 299 | 301 |
| 300 void createFloatingObjects(); | 302 void createFloatingObjects(); |
| 301 | 303 |
| 302 void styleWillChange(StyleDifference, const ComputedStyle& newStyle) overrid
e; | 304 void styleWillChange(StyleDifference, const ComputedStyle& newStyle) overrid
e; |
| 303 void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override
; | 305 void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override
; |
| 304 | 306 |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 589 | 591 |
| 590 // END METHODS DEFINED IN LayoutBlockFlowLine | 592 // END METHODS DEFINED IN LayoutBlockFlowLine |
| 591 | 593 |
| 592 }; | 594 }; |
| 593 | 595 |
| 594 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); | 596 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); |
| 595 | 597 |
| 596 } // namespace blink | 598 } // namespace blink |
| 597 | 599 |
| 598 #endif // LayoutBlockFlow_h | 600 #endif // LayoutBlockFlow_h |
| OLD | NEW |