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

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

Issue 481333005: Remove column set range map from RenderFlowThread. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
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 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 } 481 }
482 } 482 }
483 } 483 }
484 484
485 bool heightChanged = (previousHeight != newHeight); 485 bool heightChanged = (previousHeight != newHeight);
486 if (heightChanged) 486 if (heightChanged)
487 relayoutChildren = true; 487 relayoutChildren = true;
488 488
489 layoutPositionedObjects(relayoutChildren || isDocumentElement(), oldLeft != logicalLeft() ? ForcedLayoutAfterContainingBlockMoved : DefaultLayout); 489 layoutPositionedObjects(relayoutChildren || isDocumentElement(), oldLeft != logicalLeft() ? ForcedLayoutAfterContainingBlockMoved : DefaultLayout);
490 490
491 computeRegionRangeForBlock(flowThreadContainingBlock());
492
493 // Add overflow from children (unless we're multi-column, since in that case all our child overflow is clipped anyway). 491 // Add overflow from children (unless we're multi-column, since in that case all our child overflow is clipped anyway).
494 computeOverflow(oldClientAfterEdge); 492 computeOverflow(oldClientAfterEdge);
495 493
496 m_descendantsWithFloatsMarkedForLayout = false; 494 m_descendantsWithFloatsMarkedForLayout = false;
497 return true; 495 return true;
498 } 496 }
499 497
500 void RenderBlockFlow::determineLogicalLeftPositionForChild(RenderBox* child) 498 void RenderBlockFlow::determineLogicalLeftPositionForChild(RenderBox* child)
501 { 499 {
502 LayoutUnit startPosition = borderStart() + paddingStart(); 500 LayoutUnit startPosition = borderStart() + paddingStart();
(...skipping 2408 matching lines...) Expand 10 before | Expand all | Expand 10 after
2911 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() 2909 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData()
2912 { 2910 {
2913 if (m_rareData) 2911 if (m_rareData)
2914 return *m_rareData; 2912 return *m_rareData;
2915 2913
2916 m_rareData = adoptPtrWillBeNoop(new RenderBlockFlowRareData(this)); 2914 m_rareData = adoptPtrWillBeNoop(new RenderBlockFlowRareData(this));
2917 return *m_rareData; 2915 return *m_rareData;
2918 } 2916 }
2919 2917
2920 } // namespace blink 2918 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderDeprecatedFlexibleBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698