| 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 526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 537 | 537 |
| 538 // If the child moved, we have to repaint it as well as any floating/pos
itioned | 538 // If the child moved, we have to repaint it as well as any floating/pos
itioned |
| 539 // descendants. An exception is if we need a layout. In this case, we kn
ow we're going to | 539 // descendants. An exception is if we need a layout. In this case, we kn
ow we're going to |
| 540 // repaint ourselves (and the child) anyway. | 540 // repaint ourselves (and the child) anyway. |
| 541 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled() && childHadLayou
t && !selfNeedsLayout()) | 541 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled() && childHadLayou
t && !selfNeedsLayout()) |
| 542 child->repaintOverhangingFloats(true); | 542 child->repaintOverhangingFloats(true); |
| 543 else if (childHadLayout && !selfNeedsLayout() && child->checkForRepaintD
uringLayout()) | 543 else if (childHadLayout && !selfNeedsLayout() && child->checkForRepaintD
uringLayout()) |
| 544 child->repaintDuringLayoutIfMoved(oldRect); | 544 child->repaintDuringLayoutIfMoved(oldRect); |
| 545 } | 545 } |
| 546 | 546 |
| 547 if (!childHadLayout && child->checkForRepaintDuringLayout()) { | 547 if (!childHadLayout && child->checkForRepaint()) { |
| 548 if (!RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) | 548 if (!RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) |
| 549 child->repaint(); | 549 child->repaint(); |
| 550 child->repaintOverhangingFloats(true); | 550 child->repaintOverhangingFloats(true); |
| 551 } | 551 } |
| 552 | 552 |
| 553 if (paginated) { | 553 if (paginated) { |
| 554 // Check for an after page/column break. | 554 // Check for an after page/column break. |
| 555 LayoutUnit newHeight = applyAfterBreak(child, logicalHeight(), marginInf
o); | 555 LayoutUnit newHeight = applyAfterBreak(child, logicalHeight(), marginInf
o); |
| 556 if (newHeight != height()) | 556 if (newHeight != height()) |
| 557 setLogicalHeight(newHeight); | 557 setLogicalHeight(newHeight); |
| (...skipping 2247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2805 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() | 2805 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() |
| 2806 { | 2806 { |
| 2807 if (m_rareData) | 2807 if (m_rareData) |
| 2808 return *m_rareData; | 2808 return *m_rareData; |
| 2809 | 2809 |
| 2810 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); | 2810 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); |
| 2811 return *m_rareData; | 2811 return *m_rareData; |
| 2812 } | 2812 } |
| 2813 | 2813 |
| 2814 } // namespace WebCore | 2814 } // namespace WebCore |
| OLD | NEW |