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

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

Issue 15027005: [CSS Regions] Elements in a region should be assignable to a named flow (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Integrates all feedback. One of the tests causes an ASSERT in ContentShell because of Region Ranges. Created 7 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2012 Adobe Systems Incorporated. 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 flowRenderer->layoutIfNeeded(); 218 flowRenderer->layoutIfNeeded();
219 if (flowRenderer->hasAutoLogicalHeightRegions()) { 219 if (flowRenderer->hasAutoLogicalHeightRegions()) {
220 ASSERT(flowRenderer->needsTwoPhasesLayout()); 220 ASSERT(flowRenderer->needsTwoPhasesLayout());
221 flowRenderer->markAutoLogicalHeightRegionsForLayout(); 221 flowRenderer->markAutoLogicalHeightRegionsForLayout();
222 } 222 }
223 flowRenderer->setInConstrainedLayoutPhase(true); 223 flowRenderer->setInConstrainedLayoutPhase(true);
224 flowRenderer->clearNeedsTwoPhasesLayout(); 224 flowRenderer->clearNeedsTwoPhasesLayout();
225 } 225 }
226 } 226 }
227 227
228 bool FlowThreadController::isContentNodeRegisteredWithAnyNamedFlow(Node* content Node) const
229 {
230 return m_mapNamedFlowContentNodes.contains(contentNode);
231 }
232
228 #ifndef NDEBUG 233 #ifndef NDEBUG
229 bool FlowThreadController::isAutoLogicalHeightRegionsCountConsistent() const 234 bool FlowThreadController::isAutoLogicalHeightRegionsCountConsistent() const
230 { 235 {
231 if (!hasRenderNamedFlowThreads()) 236 if (!hasRenderNamedFlowThreads())
232 return !hasFlowThreadsWithAutoLogicalHeightRegions(); 237 return !hasFlowThreadsWithAutoLogicalHeightRegions();
233 238
234 for (RenderNamedFlowThreadList::iterator iter = m_renderNamedFlowThreadList- >begin(); iter != m_renderNamedFlowThreadList->end(); ++iter) { 239 for (RenderNamedFlowThreadList::iterator iter = m_renderNamedFlowThreadList- >begin(); iter != m_renderNamedFlowThreadList->end(); ++iter) {
235 if (!(*iter)->isAutoLogicalHeightRegionsCountConsistent()) 240 if (!(*iter)->isAutoLogicalHeightRegionsCountConsistent())
236 return false; 241 return false;
237 } 242 }
238 243
239 return true; 244 return true;
240 } 245 }
241 #endif 246 #endif
242 247
243 } // namespace WebCore 248 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698