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

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

Issue 1472053002: Jump to the next outer column when an inner column is too short. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: code review Created 5 years 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/Source/core/layout/LayoutMultiColumnSet.h ('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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 remainingLogicalHeight = intMod(remainingLogicalHeight, pageLogicalHeigh t); 90 remainingLogicalHeight = intMod(remainingLogicalHeight, pageLogicalHeigh t);
91 } 91 }
92 return remainingLogicalHeight; 92 return remainingLogicalHeight;
93 } 93 }
94 94
95 bool LayoutMultiColumnSet::isPageLogicalHeightKnown() const 95 bool LayoutMultiColumnSet::isPageLogicalHeightKnown() const
96 { 96 {
97 return firstFragmentainerGroup().logicalHeight(); 97 return firstFragmentainerGroup().logicalHeight();
98 } 98 }
99 99
100 LayoutUnit LayoutMultiColumnSet::nextLogicalTopForUnbreakableContent(LayoutUnit flowThreadOffset, LayoutUnit contentLogicalHeight) const
101 {
102 ASSERT(pageLogicalTopForOffset(flowThreadOffset) == flowThreadOffset);
103 LayoutMultiColumnFlowThread* enclosingFlowThread = multiColumnFlowThread()-> enclosingFlowThread();
104 if (!enclosingFlowThread) {
105 // If there's no enclosing fragmentation context, there'll ever be only one row, and all
106 // columns there will have the same height.
107 return flowThreadOffset;
108 }
109
110 // Assert the problematic situation. If we have no problem with the column h eight, why are we
111 // even here?
112 ASSERT(pageLogicalHeightForOffset(flowThreadOffset) < contentLogicalHeight);
113
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
116 // look beyond the first row here.
117 const MultiColumnFragmentainerGroup& firstRow = firstFragmentainerGroup();
118 LayoutUnit firstRowLogicalBottomInFlowThread = firstRow.logicalTopInFlowThre ad() + firstRow.logicalHeight() * usedColumnCount();
119 if (flowThreadOffset >= firstRowLogicalBottomInFlowThread)
120 return flowThreadOffset; // We're not in the first row. Give up.
121 LayoutUnit newLogicalHeight = enclosingFlowThread->pageLogicalHeightForOffse t(firstRowLogicalBottomInFlowThread);
122 if (contentLogicalHeight > newLogicalHeight) {
123 // The next outer column or page doesn't have enough space either. Give up and stay where
124 // we are.
125 return flowThreadOffset;
126 }
127 return firstRowLogicalBottomInFlowThread;
128 }
129
100 LayoutMultiColumnSet* LayoutMultiColumnSet::nextSiblingMultiColumnSet() const 130 LayoutMultiColumnSet* LayoutMultiColumnSet::nextSiblingMultiColumnSet() const
101 { 131 {
102 for (LayoutObject* sibling = nextSibling(); sibling; sibling = sibling->next Sibling()) { 132 for (LayoutObject* sibling = nextSibling(); sibling; sibling = sibling->next Sibling()) {
103 if (sibling->isLayoutMultiColumnSet()) 133 if (sibling->isLayoutMultiColumnSet())
104 return toLayoutMultiColumnSet(sibling); 134 return toLayoutMultiColumnSet(sibling);
105 } 135 }
106 return nullptr; 136 return nullptr;
107 } 137 }
108 138
109 LayoutMultiColumnSet* LayoutMultiColumnSet::previousSiblingMultiColumnSet() cons t 139 LayoutMultiColumnSet* LayoutMultiColumnSet::previousSiblingMultiColumnSet() cons t
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 380
351 LayoutRect LayoutMultiColumnSet::flowThreadPortionRect() const 381 LayoutRect LayoutMultiColumnSet::flowThreadPortionRect() const
352 { 382 {
353 LayoutRect portionRect(LayoutUnit(), logicalTopInFlowThread(), pageLogicalWi dth(), logicalHeightInFlowThread()); 383 LayoutRect portionRect(LayoutUnit(), logicalTopInFlowThread(), pageLogicalWi dth(), logicalHeightInFlowThread());
354 if (!isHorizontalWritingMode()) 384 if (!isHorizontalWritingMode())
355 return portionRect.transposedRect(); 385 return portionRect.transposedRect();
356 return portionRect; 386 return portionRect;
357 } 387 }
358 388
359 } 389 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698