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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.cpp

Issue 1619703003: Pass values in the right flow thread's coordinate space. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moar line-height. Created 4 years, 11 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 | « third_party/WebKit/LayoutTests/fast/multicol/line-too-tall-for-second-outer-row-expected.html ('k') | no next file » | 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) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 // even here? 111 // even here?
112 ASSERT(pageLogicalHeightForOffset(flowThreadOffset) < contentLogicalHeight); 112 ASSERT(pageLogicalHeightForOffset(flowThreadOffset) < contentLogicalHeight);
113 113
114 // There's a likelihood for subsequent rows to be taller than the first one. 114 // There's a likelihood for subsequent rows to be taller than the first one.
115 // TODO(mstensho): if we're doubly nested (e.g. multicol in multicol in mult icol), we need to 115 // TODO(mstensho): if we're doubly nested (e.g. multicol in multicol in mult icol), we need to
116 // look beyond the first row here. 116 // look beyond the first row here.
117 const MultiColumnFragmentainerGroup& firstRow = firstFragmentainerGroup(); 117 const MultiColumnFragmentainerGroup& firstRow = firstFragmentainerGroup();
118 LayoutUnit firstRowLogicalBottomInFlowThread = firstRow.logicalTopInFlowThre ad() + firstRow.logicalHeight() * usedColumnCount(); 118 LayoutUnit firstRowLogicalBottomInFlowThread = firstRow.logicalTopInFlowThre ad() + firstRow.logicalHeight() * usedColumnCount();
119 if (flowThreadOffset >= firstRowLogicalBottomInFlowThread) 119 if (flowThreadOffset >= firstRowLogicalBottomInFlowThread)
120 return flowThreadOffset; // We're not in the first row. Give up. 120 return flowThreadOffset; // We're not in the first row. Give up.
121 LayoutUnit newLogicalHeight = enclosingFragmentationContext->fragmentainerLo gicalHeightAt(firstRowLogicalBottomInFlowThread); 121 LayoutUnit newLogicalHeight = enclosingFragmentationContext->fragmentainerLo gicalHeightAt(firstRow.blockOffsetInEnclosingFragmentationContext() + firstRow.l ogicalHeight());
122 if (contentLogicalHeight > newLogicalHeight) { 122 if (contentLogicalHeight > newLogicalHeight) {
123 // The next outer column or page doesn't have enough space either. Give up and stay where 123 // The next outer column or page doesn't have enough space either. Give up and stay where
124 // we are. 124 // we are.
125 return flowThreadOffset; 125 return flowThreadOffset;
126 } 126 }
127 return firstRowLogicalBottomInFlowThread; 127 return firstRowLogicalBottomInFlowThread;
128 } 128 }
129 129
130 LayoutMultiColumnSet* LayoutMultiColumnSet::nextSiblingMultiColumnSet() const 130 LayoutMultiColumnSet* LayoutMultiColumnSet::nextSiblingMultiColumnSet() const
131 { 131 {
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 403
404 LayoutRect LayoutMultiColumnSet::flowThreadPortionRect() const 404 LayoutRect LayoutMultiColumnSet::flowThreadPortionRect() const
405 { 405 {
406 LayoutRect portionRect(LayoutUnit(), logicalTopInFlowThread(), pageLogicalWi dth(), logicalHeightInFlowThread()); 406 LayoutRect portionRect(LayoutUnit(), logicalTopInFlowThread(), pageLogicalWi dth(), logicalHeightInFlowThread());
407 if (!isHorizontalWritingMode()) 407 if (!isHorizontalWritingMode())
408 return portionRect.transposedRect(); 408 return portionRect.transposedRect();
409 return portionRect; 409 return portionRect;
410 } 410 }
411 411
412 } 412 }
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/multicol/line-too-tall-for-second-outer-row-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698