Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Side by Side Diff: Source/core/rendering/SubtreeLayoutScope.cpp

Issue 18601002: Add infrastructure for partial layouts (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address reviewer comments. Add PartialLayoutState and PartialLayoutDisabler Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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 layotu and will leave the tree as needing layo ut.
ojan 2013/08/27 01:33:41 typo: layotu
48 if (m_root->frameView()->partialLayout().shouldStop()) {
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) {
ojan 2013/08/27 01:33:41 I think we can still do this loop in the partial l
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 }
57 #endif 63 #endif
58 } 64 }
59 65
60 void SubtreeLayoutScope::setNeedsLayout(RenderObject* descendant) 66 void SubtreeLayoutScope::setNeedsLayout(RenderObject* descendant)
61 { 67 {
62 ASSERT(descendant->isDescendantOf(m_root)); 68 ASSERT(descendant->isDescendantOf(m_root));
63 descendant->setNeedsLayout(MarkContainingBlockChain, this); 69 descendant->setNeedsLayout(MarkContainingBlockChain, this);
64 } 70 }
65 71
66 void SubtreeLayoutScope::setChildNeedsLayout(RenderObject* descendant) 72 void SubtreeLayoutScope::setChildNeedsLayout(RenderObject* descendant)
67 { 73 {
68 ASSERT(descendant->isDescendantOf(m_root)); 74 ASSERT(descendant->isDescendantOf(m_root));
69 descendant->setChildNeedsLayout(MarkContainingBlockChain, this); 75 descendant->setChildNeedsLayout(MarkContainingBlockChain, this);
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 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698