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

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

Issue 299213002: [New Multicolumn] Cleanup: Remove redundant members. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@370813
Patch Set: Created 6 years, 7 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
« no previous file with comments | « no previous file | Source/core/rendering/RenderMultiColumnFlowThread.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 setLogicalTopForChild(flowThread, borderBefore() + paddingBefore()); 178 setLogicalTopForChild(flowThread, borderBefore() + paddingBefore());
179 flowThread->layoutColumns(relayoutChildren, layoutScope); 179 flowThread->layoutColumns(relayoutChildren, layoutScope);
180 determineLogicalLeftPositionForChild(flowThread); 180 determineLogicalLeftPositionForChild(flowThread);
181 return flowThread; 181 return flowThread;
182 } 182 }
183 183
184 bool RenderBlockFlow::updateLogicalWidthAndColumnWidth() 184 bool RenderBlockFlow::updateLogicalWidthAndColumnWidth()
185 { 185 {
186 bool relayoutChildren = RenderBlock::updateLogicalWidthAndColumnWidth(); 186 bool relayoutChildren = RenderBlock::updateLogicalWidthAndColumnWidth();
187 if (RenderMultiColumnFlowThread* flowThread = multiColumnFlowThread()) { 187 if (RenderMultiColumnFlowThread* flowThread = multiColumnFlowThread()) {
188 if (flowThread->computeColumnCountAndWidth()) 188 if (flowThread->needsNewWidth())
189 return true; 189 return true;
190 } 190 }
191 return relayoutChildren; 191 return relayoutChildren;
192 } 192 }
193 193
194 void RenderBlockFlow::checkForPaginationLogicalHeightChange(LayoutUnit& pageLogi calHeight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight) 194 void RenderBlockFlow::checkForPaginationLogicalHeightChange(LayoutUnit& pageLogi calHeight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight)
195 { 195 {
196 if (RenderMultiColumnFlowThread* flowThread = multiColumnFlowThread()) { 196 if (RenderMultiColumnFlowThread* flowThread = multiColumnFlowThread()) {
197 LogicalExtentComputedValues computedValues; 197 LogicalExtentComputedValues computedValues;
198 computeLogicalHeight(LayoutUnit(), logicalTop(), computedValues); 198 computeLogicalHeight(LayoutUnit(), logicalTop(), computedValues);
(...skipping 2603 matching lines...) Expand 10 before | Expand all | Expand 10 after
2802 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() 2802 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData()
2803 { 2803 {
2804 if (m_rareData) 2804 if (m_rareData)
2805 return *m_rareData; 2805 return *m_rareData;
2806 2806
2807 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); 2807 m_rareData = adoptPtr(new RenderBlockFlowRareData(this));
2808 return *m_rareData; 2808 return *m_rareData;
2809 } 2809 }
2810 2810
2811 } // namespace WebCore 2811 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RenderMultiColumnFlowThread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698