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