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

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

Issue 147233002: Remove internal recursion for RenderBlockFlow and RenderMultiColumnBlock layout (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase to apply on latest trunk Created 6 years, 10 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 | « Source/core/rendering/LayoutState.h ('k') | Source/core/rendering/RenderBlock.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) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 partitionFree(ptr); 174 partitionFree(ptr);
175 } 175 }
176 176
177 void LayoutState::clearPaginationInformation() 177 void LayoutState::clearPaginationInformation()
178 { 178 {
179 m_pageLogicalHeight = m_next->m_pageLogicalHeight; 179 m_pageLogicalHeight = m_next->m_pageLogicalHeight;
180 m_pageOffset = m_next->m_pageOffset; 180 m_pageOffset = m_next->m_pageOffset;
181 m_columnInfo = m_next->m_columnInfo; 181 m_columnInfo = m_next->m_columnInfo;
182 } 182 }
183 183
184 LayoutUnit LayoutState::pageLogicalOffset(RenderBox* child, LayoutUnit childLogi calOffset) const 184 LayoutUnit LayoutState::pageLogicalOffset(const RenderBox* child, LayoutUnit chi ldLogicalOffset) const
185 { 185 {
186 if (child->isHorizontalWritingMode()) 186 if (child->isHorizontalWritingMode())
187 return m_layoutOffset.height() + childLogicalOffset - m_pageOffset.heigh t(); 187 return m_layoutOffset.height() + childLogicalOffset - m_pageOffset.heigh t();
188 return m_layoutOffset.width() + childLogicalOffset - m_pageOffset.width(); 188 return m_layoutOffset.width() + childLogicalOffset - m_pageOffset.width();
189 } 189 }
190 190
191 void LayoutState::addForcedColumnBreak(RenderBox* child, LayoutUnit childLogical Offset) 191 void LayoutState::addForcedColumnBreak(RenderBox* child, LayoutUnit childLogical Offset)
192 { 192 {
193 if (!m_columnInfo || m_columnInfo->columnHeight()) 193 if (!m_columnInfo || m_columnInfo->columnHeight())
194 return; 194 return;
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 LayoutUnit paginationDelta = gridLineHeight - remainder; 269 LayoutUnit paginationDelta = gridLineHeight - remainder;
270 if (isHorizontalWritingMode) 270 if (isHorizontalWritingMode)
271 m_lineGridPaginationOrigin.setHeight(paginationDelta); 271 m_lineGridPaginationOrigin.setHeight(paginationDelta);
272 else 272 else
273 m_lineGridPaginationOrigin.setWidth(paginationDelta); 273 m_lineGridPaginationOrigin.setWidth(paginationDelta);
274 } 274 }
275 } 275 }
276 } 276 }
277 277
278 } // namespace WebCore 278 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/LayoutState.h ('k') | Source/core/rendering/RenderBlock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698