| 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 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 LayoutRepainter repainter(*this, checkForRepaintDuringLayout()); | 311 LayoutRepainter repainter(*this, checkForRepaintDuringLayout()); |
| 312 while (!done) | 312 while (!done) |
| 313 done = layoutBlockFlow(relayoutChildren, pageLogicalHeight, layoutScope)
; | 313 done = layoutBlockFlow(relayoutChildren, pageLogicalHeight, layoutScope)
; |
| 314 | 314 |
| 315 fitBorderToLinesIfNeeded(); | 315 fitBorderToLinesIfNeeded(); |
| 316 | 316 |
| 317 RenderView* renderView = view(); | 317 RenderView* renderView = view(); |
| 318 if (renderView->layoutState()->pageLogicalHeight()) | 318 if (renderView->layoutState()->pageLogicalHeight()) |
| 319 setPageLogicalOffset(renderView->layoutState()->pageLogicalOffset(*this,
logicalTop())); | 319 setPageLogicalOffset(renderView->layoutState()->pageLogicalOffset(*this,
logicalTop())); |
| 320 | 320 |
| 321 updateLayerTransform(); | 321 updateLayerTransformAfterLayout(); |
| 322 | 322 |
| 323 // Update our scroll information if we're overflow:auto/scroll/hidden now th
at we know if | 323 // Update our scroll information if we're overflow:auto/scroll/hidden now th
at we know if |
| 324 // we overflow or not. | 324 // we overflow or not. |
| 325 updateScrollInfoAfterLayout(); | 325 updateScrollInfoAfterLayout(); |
| 326 | 326 |
| 327 // Repaint with our new bounds if they are different from our old bounds. | 327 // Repaint with our new bounds if they are different from our old bounds. |
| 328 bool didFullRepaint = repainter.repaintAfterLayout(); | 328 bool didFullRepaint = repainter.repaintAfterLayout(); |
| 329 if (!didFullRepaint && m_repaintLogicalTop != m_repaintLogicalBottom && (sty
le()->visibility() == VISIBLE || enclosingLayer()->hasVisibleContent())) { | 329 if (!didFullRepaint && m_repaintLogicalTop != m_repaintLogicalBottom && (sty
le()->visibility() == VISIBLE || enclosingLayer()->hasVisibleContent())) { |
| 330 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) | 330 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) |
| 331 setShouldInvalidateOverflowForPaint(true); | 331 setShouldInvalidateOverflowForPaint(true); |
| (...skipping 2471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2803 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() | 2803 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() |
| 2804 { | 2804 { |
| 2805 if (m_rareData) | 2805 if (m_rareData) |
| 2806 return *m_rareData; | 2806 return *m_rareData; |
| 2807 | 2807 |
| 2808 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); | 2808 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); |
| 2809 return *m_rareData; | 2809 return *m_rareData; |
| 2810 } | 2810 } |
| 2811 | 2811 |
| 2812 } // namespace WebCore | 2812 } // namespace WebCore |
| OLD | NEW |