| 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 26 matching lines...) Expand all Loading... |
| 37 namespace WebCore { | 37 namespace WebCore { |
| 38 | 38 |
| 39 SubtreeLayoutScope::SubtreeLayoutScope(RenderObject* root) | 39 SubtreeLayoutScope::SubtreeLayoutScope(RenderObject* root) |
| 40 : m_root(root) | 40 : m_root(root) |
| 41 { | 41 { |
| 42 RELEASE_ASSERT(m_root->document().view()->isInLayout()); | 42 RELEASE_ASSERT(m_root->document().view()->isInLayout()); |
| 43 } | 43 } |
| 44 | 44 |
| 45 SubtreeLayoutScope::~SubtreeLayoutScope() | 45 SubtreeLayoutScope::~SubtreeLayoutScope() |
| 46 { | 46 { |
| 47 // Partial layout early-exits layout and will leave the tree as needing layo
ut. |
| 48 if (m_root->frameView()->partialLayout().isStopping()) { |
| 49 ASSERT(m_root->needsLayout()); |
| 50 return; |
| 51 } |
| 52 |
| 47 RELEASE_ASSERT(!m_root->needsLayout()); | 53 RELEASE_ASSERT(!m_root->needsLayout()); |
| 48 | 54 |
| 49 #ifndef NDEBUG | 55 #ifndef NDEBUG |
| 50 for (HashSet<RenderObject*>::iterator it = m_renderersToLayout.begin(); it !
= m_renderersToLayout.end(); ++it) { | 56 for (HashSet<RenderObject*>::iterator it = m_renderersToLayout.begin(); it !
= m_renderersToLayout.end(); ++it) { |
| 51 RenderObject* renderer = *it; | 57 RenderObject* renderer = *it; |
| 52 // FIXME: Thie patter is really common. Move it into an assertRendererLa
idOut function. | 58 // FIXME: Thie patter is really common. Move it into an assertRendererLa
idOut function. |
| 53 if (renderer->needsLayout()) | 59 if (renderer->needsLayout()) |
| 54 showRenderTree(renderer); | 60 showRenderTree(renderer); |
| 55 ASSERT(!renderer->needsLayout()); | 61 ASSERT(!renderer->needsLayout()); |
| 56 } | 62 } |
| (...skipping 13 matching lines...) Expand all Loading... |
| 70 } | 76 } |
| 71 | 77 |
| 72 void SubtreeLayoutScope::addRendererToLayout(RenderObject* renderer) | 78 void SubtreeLayoutScope::addRendererToLayout(RenderObject* renderer) |
| 73 { | 79 { |
| 74 #ifndef NDEBUG | 80 #ifndef NDEBUG |
| 75 m_renderersToLayout.add(renderer); | 81 m_renderersToLayout.add(renderer); |
| 76 #endif | 82 #endif |
| 77 } | 83 } |
| 78 | 84 |
| 79 } | 85 } |
| OLD | NEW |