| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 10 * | 10 * |
| (...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 364 // We need to set m_doFullPaintInvalidation before triggering layout
as RenderObject::checkForPaintInvalidation | 364 // We need to set m_doFullPaintInvalidation before triggering layout
as RenderObject::checkForPaintInvalidation |
| 365 // checks the boolean to disable local paint invalidations. | 365 // checks the boolean to disable local paint invalidations. |
| 366 m_doFullPaintInvalidation |= renderView()->shouldDoFullPaintInvalida
tionForNextLayout(); | 366 m_doFullPaintInvalidation |= renderView()->shouldDoFullPaintInvalida
tionForNextLayout(); |
| 367 } | 367 } |
| 368 | 368 |
| 369 layer = rootForThisLayout->enclosingLayer(); | 369 layer = rootForThisLayout->enclosingLayer(); |
| 370 | 370 |
| 371 performLayout(rootForThisLayout, inSubtreeLayout); | 371 performLayout(rootForThisLayout, inSubtreeLayout); |
| 372 | 372 |
| 373 m_layoutSubtreeRoot = 0; | 373 m_layoutSubtreeRoot = 0; |
| 374 // We need to ensure that we mark up all renderers up to the RenderView | |
| 375 // for paint invalidation. This simplifies our code as we just always | |
| 376 // do a full tree walk. | |
| 377 if (RenderObject* container = rootForThisLayout->container()) | |
| 378 container->setMayNeedPaintInvalidation(true); | |
| 379 } // Reset m_layoutSchedulingEnabled to its previous value. | 374 } // Reset m_layoutSchedulingEnabled to its previous value. |
| 380 | 375 |
| 381 layer->updateLayerPositionsAfterLayout(); | 376 layer->updateLayerPositionsAfterLayout(); |
| 382 | 377 |
| 383 m_layoutCount++; | 378 m_layoutCount++; |
| 384 | 379 |
| 385 ASSERT(!rootForThisLayout->needsLayout()); | 380 ASSERT(!rootForThisLayout->needsLayout()); |
| 386 | 381 |
| 387 scheduleOrPerformPostLayoutTasks(); | 382 scheduleOrPerformPostLayoutTasks(); |
| 388 | 383 |
| (...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1011 totalObjects = 0; | 1006 totalObjects = 0; |
| 1012 | 1007 |
| 1013 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { | 1008 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { |
| 1014 ++totalObjects; | 1009 ++totalObjects; |
| 1015 if (o->needsLayout()) | 1010 if (o->needsLayout()) |
| 1016 ++needsLayoutObjects; | 1011 ++needsLayoutObjects; |
| 1017 } | 1012 } |
| 1018 } | 1013 } |
| 1019 | 1014 |
| 1020 } // namespace blink | 1015 } // namespace blink |
| OLD | NEW |