| 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 1328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1339 if (childrenInline()) { | 1339 if (childrenInline()) { |
| 1340 LayoutUnit changeLogicalTop = LayoutUnit::max(); | 1340 LayoutUnit changeLogicalTop = LayoutUnit::max(); |
| 1341 LayoutUnit changeLogicalBottom = LayoutUnit::min(); | 1341 LayoutUnit changeLogicalBottom = LayoutUnit::min(); |
| 1342 if (m_floatingObjects) { | 1342 if (m_floatingObjects) { |
| 1343 const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set(); | 1343 const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set(); |
| 1344 FloatingObjectSetIterator end = floatingObjectSet.end(); | 1344 FloatingObjectSetIterator end = floatingObjectSet.end(); |
| 1345 for (FloatingObjectSetIterator it = floatingObjectSet.begin(); it != end; | 1345 for (FloatingObjectSetIterator it = floatingObjectSet.begin(); it != end; |
| 1346 ++it) { | 1346 ++it) { |
| 1347 const FloatingObject& floatingObject = *it->get(); | 1347 const FloatingObject& floatingObject = *it->get(); |
| 1348 FloatingObject* oldFloatingObject = | 1348 FloatingObject* oldFloatingObject = |
| 1349 floatMap.get(floatingObject.layoutObject()); | 1349 floatMap.at(floatingObject.layoutObject()); |
| 1350 LayoutUnit logicalBottom = logicalBottomForFloat(floatingObject); | 1350 LayoutUnit logicalBottom = logicalBottomForFloat(floatingObject); |
| 1351 if (oldFloatingObject) { | 1351 if (oldFloatingObject) { |
| 1352 LayoutUnit oldLogicalBottom = | 1352 LayoutUnit oldLogicalBottom = |
| 1353 logicalBottomForFloat(*oldFloatingObject); | 1353 logicalBottomForFloat(*oldFloatingObject); |
| 1354 if (logicalWidthForFloat(floatingObject) != | 1354 if (logicalWidthForFloat(floatingObject) != |
| 1355 logicalWidthForFloat(*oldFloatingObject) || | 1355 logicalWidthForFloat(*oldFloatingObject) || |
| 1356 logicalLeftForFloat(floatingObject) != | 1356 logicalLeftForFloat(floatingObject) != |
| 1357 logicalLeftForFloat(*oldFloatingObject)) { | 1357 logicalLeftForFloat(*oldFloatingObject)) { |
| 1358 changeLogicalTop = LayoutUnit(); | 1358 changeLogicalTop = LayoutUnit(); |
| 1359 changeLogicalBottom = std::max( | 1359 changeLogicalBottom = std::max( |
| (...skipping 3245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4605 return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState); | 4605 return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState); |
| 4606 } | 4606 } |
| 4607 | 4607 |
| 4608 void LayoutBlockFlow::invalidateDisplayItemClients( | 4608 void LayoutBlockFlow::invalidateDisplayItemClients( |
| 4609 PaintInvalidationReason invalidationReason) const { | 4609 PaintInvalidationReason invalidationReason) const { |
| 4610 BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients( | 4610 BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients( |
| 4611 invalidationReason); | 4611 invalidationReason); |
| 4612 } | 4612 } |
| 4613 | 4613 |
| 4614 } // namespace blink | 4614 } // namespace blink |
| OLD | NEW |