| 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 2407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2418 } | 2418 } |
| 2419 } | 2419 } |
| 2420 | 2420 |
| 2421 setLogicalTopForFloat(floatingObject, floatLogicalLocation.y()); | 2421 setLogicalTopForFloat(floatingObject, floatLogicalLocation.y()); |
| 2422 | 2422 |
| 2423 setLogicalHeightForFloat(floatingObject, logicalHeightForChild(childBox)
+ marginBeforeForChild(childBox) + marginAfterForChild(childBox)); | 2423 setLogicalHeightForFloat(floatingObject, logicalHeightForChild(childBox)
+ marginBeforeForChild(childBox) + marginAfterForChild(childBox)); |
| 2424 | 2424 |
| 2425 m_floatingObjects->addPlacedObject(floatingObject); | 2425 m_floatingObjects->addPlacedObject(floatingObject); |
| 2426 | 2426 |
| 2427 if (ShapeOutsideInfo* shapeOutside = childBox->shapeOutsideInfo()) | 2427 if (ShapeOutsideInfo* shapeOutside = childBox->shapeOutsideInfo()) |
| 2428 shapeOutside->setShapeSize(logicalWidthForChild(childBox), logicalHe
ightForChild(childBox)); | 2428 shapeOutside->setReferenceBoxLogicalSize(logicalSizeForChild(childBo
x)); |
| 2429 | 2429 |
| 2430 // If the child moved, we have to repaint it. | 2430 // If the child moved, we have to repaint it. |
| 2431 if (!RuntimeEnabledFeatures::repaintAfterLayoutEnabled() | 2431 if (!RuntimeEnabledFeatures::repaintAfterLayoutEnabled() |
| 2432 && childBox->checkForRepaintDuringLayout()) | 2432 && childBox->checkForRepaintDuringLayout()) |
| 2433 childBox->repaintDuringLayoutIfMoved(oldRect); | 2433 childBox->repaintDuringLayoutIfMoved(oldRect); |
| 2434 } | 2434 } |
| 2435 return true; | 2435 return true; |
| 2436 } | 2436 } |
| 2437 | 2437 |
| 2438 bool RenderBlockFlow::hasOverhangingFloat(RenderBox* renderer) | 2438 bool RenderBlockFlow::hasOverhangingFloat(RenderBox* renderer) |
| (...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2832 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() | 2832 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() |
| 2833 { | 2833 { |
| 2834 if (m_rareData) | 2834 if (m_rareData) |
| 2835 return *m_rareData; | 2835 return *m_rareData; |
| 2836 | 2836 |
| 2837 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); | 2837 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); |
| 2838 return *m_rareData; | 2838 return *m_rareData; |
| 2839 } | 2839 } |
| 2840 | 2840 |
| 2841 } // namespace WebCore | 2841 } // namespace WebCore |
| OLD | NEW |