| 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 29 matching lines...) Expand all Loading... |
| 40 : m_root(root) | 40 : m_root(root) |
| 41 { | 41 { |
| 42 RELEASE_ASSERT(m_root.document().view()->isInPerformLayout()); | 42 RELEASE_ASSERT(m_root.document().view()->isInPerformLayout()); |
| 43 } | 43 } |
| 44 | 44 |
| 45 SubtreeLayoutScope::~SubtreeLayoutScope() | 45 SubtreeLayoutScope::~SubtreeLayoutScope() |
| 46 { | 46 { |
| 47 RELEASE_ASSERT(!m_root.needsLayout()); | 47 RELEASE_ASSERT(!m_root.needsLayout()); |
| 48 | 48 |
| 49 #if ENABLE(ASSERT) | 49 #if ENABLE(ASSERT) |
| 50 for (HashSet<LayoutObject*>::iterator it = m_renderersToLayout.begin(); it !
= m_renderersToLayout.end(); ++it) | 50 for (auto* renderer : m_renderersToLayout) |
| 51 (*it)->assertRendererLaidOut(); | 51 renderer->assertRendererLaidOut(); |
| 52 #endif | 52 #endif |
| 53 } | 53 } |
| 54 | 54 |
| 55 void SubtreeLayoutScope::setNeedsLayout(LayoutObject* descendant, LayoutInvalida
tionReasonForTracing reason) | 55 void SubtreeLayoutScope::setNeedsLayout(LayoutObject* descendant, LayoutInvalida
tionReasonForTracing reason) |
| 56 { | 56 { |
| 57 ASSERT(descendant->isDescendantOf(&m_root)); | 57 ASSERT(descendant->isDescendantOf(&m_root)); |
| 58 descendant->setNeedsLayout(reason, MarkContainerChain, this); | 58 descendant->setNeedsLayout(reason, MarkContainerChain, this); |
| 59 } | 59 } |
| 60 | 60 |
| 61 void SubtreeLayoutScope::setChildNeedsLayout(LayoutObject* descendant) | 61 void SubtreeLayoutScope::setChildNeedsLayout(LayoutObject* descendant) |
| 62 { | 62 { |
| 63 ASSERT(descendant->isDescendantOf(&m_root)); | 63 ASSERT(descendant->isDescendantOf(&m_root)); |
| 64 descendant->setChildNeedsLayout(MarkContainerChain, this); | 64 descendant->setChildNeedsLayout(MarkContainerChain, this); |
| 65 } | 65 } |
| 66 | 66 |
| 67 void SubtreeLayoutScope::addRendererToLayout(LayoutObject* renderer) | 67 void SubtreeLayoutScope::addRendererToLayout(LayoutObject* renderer) |
| 68 { | 68 { |
| 69 #if ENABLE(ASSERT) | 69 #if ENABLE(ASSERT) |
| 70 m_renderersToLayout.add(renderer); | 70 m_renderersToLayout.add(renderer); |
| 71 #endif | 71 #endif |
| 72 } | 72 } |
| 73 | 73 |
| 74 } | 74 } |
| OLD | NEW |