| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 3547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3558 #endif | 3558 #endif |
| 3559 } | 3559 } |
| 3560 markLinesDirtyInBlockRange(LayoutUnit(), logicalBottom); | 3560 markLinesDirtyInBlockRange(LayoutUnit(), logicalBottom); |
| 3561 } | 3561 } |
| 3562 m_floatingObjects->remove(&floatingObject); | 3562 m_floatingObjects->remove(&floatingObject); |
| 3563 } | 3563 } |
| 3564 } | 3564 } |
| 3565 } | 3565 } |
| 3566 | 3566 |
| 3567 void LayoutBlockFlow::removeFloatingObjectsBelow(FloatingObject* lastFloat, | 3567 void LayoutBlockFlow::removeFloatingObjectsBelow(FloatingObject* lastFloat, |
| 3568 int logicalOffset) { | 3568 LayoutUnit logicalOffset) { |
| 3569 if (!containsFloats()) | 3569 if (!containsFloats()) |
| 3570 return; | 3570 return; |
| 3571 | 3571 |
| 3572 const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set(); | 3572 const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set(); |
| 3573 FloatingObject* curr = floatingObjectSet.last().get(); | 3573 FloatingObject* curr = floatingObjectSet.last().get(); |
| 3574 while (curr != lastFloat && | 3574 while (curr != lastFloat && |
| 3575 (!curr->isPlaced() || logicalTopForFloat(*curr) >= logicalOffset)) { | 3575 (!curr->isPlaced() || logicalTopForFloat(*curr) >= logicalOffset)) { |
| 3576 m_floatingObjects->remove(curr); | 3576 m_floatingObjects->remove(curr); |
| 3577 if (floatingObjectSet.isEmpty()) | 3577 if (floatingObjectSet.isEmpty()) |
| 3578 break; | 3578 break; |
| (...skipping 985 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4564 return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState); | 4564 return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState); |
| 4565 } | 4565 } |
| 4566 | 4566 |
| 4567 void LayoutBlockFlow::invalidateDisplayItemClients( | 4567 void LayoutBlockFlow::invalidateDisplayItemClients( |
| 4568 PaintInvalidationReason invalidationReason) const { | 4568 PaintInvalidationReason invalidationReason) const { |
| 4569 BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients( | 4569 BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients( |
| 4570 invalidationReason); | 4570 invalidationReason); |
| 4571 } | 4571 } |
| 4572 | 4572 |
| 4573 } // namespace blink | 4573 } // namespace blink |
| OLD | NEW |