| 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 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 309 | 309 |
| 310 m_nestedLayoutCount++; | 310 m_nestedLayoutCount++; |
| 311 | 311 |
| 312 if (!inSubtreeLayout) { | 312 if (!inSubtreeLayout) { |
| 313 if (m_firstLayout) { | 313 if (m_firstLayout) { |
| 314 m_firstLayout = false; | 314 m_firstLayout = false; |
| 315 m_firstLayoutCallbackPending = true; | 315 m_firstLayoutCallbackPending = true; |
| 316 m_lastViewportSize = layoutSize(); | 316 m_lastViewportSize = layoutSize(); |
| 317 } | 317 } |
| 318 | 318 |
| 319 m_size = LayoutSize(layoutSize().width(), layoutSize().height()); | 319 m_size = LayoutSize(layoutSize()); |
| 320 } | 320 } |
| 321 | 321 |
| 322 layer = rootForThisLayout->enclosingLayer(); | 322 layer = rootForThisLayout->enclosingLayer(); |
| 323 | 323 |
| 324 performLayout(rootForThisLayout, inSubtreeLayout); | 324 performLayout(rootForThisLayout, inSubtreeLayout); |
| 325 | 325 |
| 326 m_layoutSubtreeRoot = 0; | 326 m_layoutSubtreeRoot = 0; |
| 327 } // Reset m_layoutSchedulingEnabled to its previous value. | 327 } // Reset m_layoutSchedulingEnabled to its previous value. |
| 328 | 328 |
| 329 layer->updateLayerPositionsAfterLayout(); | 329 layer->updateLayerPositionsAfterLayout(); |
| (...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 769 totalObjects = 0; | 769 totalObjects = 0; |
| 770 | 770 |
| 771 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { | 771 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { |
| 772 ++totalObjects; | 772 ++totalObjects; |
| 773 if (o->needsLayout()) | 773 if (o->needsLayout()) |
| 774 ++needsLayoutObjects; | 774 ++needsLayoutObjects; |
| 775 } | 775 } |
| 776 } | 776 } |
| 777 | 777 |
| 778 } // namespace blink | 778 } // namespace blink |
| OLD | NEW |