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

Side by Side Diff: third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc

Issue 2266313002: [layoutng] Create a more correct constraint space for children (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/layout/ng/ng_block_layout_algorithm.h" 5 #include "core/layout/ng/ng_block_layout_algorithm.h"
6 6
7 #include "core/layout/LayoutBox.h" 7 #include "core/layout/LayoutBox.h"
8 #include "core/layout/ng/ng_constraint_space.h" 8 #include "core/layout/ng/ng_constraint_space.h"
9 #include "core/layout/ng/ng_fragment.h" 9 #include "core/layout/ng/ng_fragment.h"
10 #include "core/layout/ng/ng_length_utils.h" 10 #include "core/layout/ng/ng_length_utils.h"
11 #include "core/layout/ng/ng_margin_strut.h" 11 #include "core/layout/ng/ng_margin_strut.h"
12 #include "core/style/ComputedStyle.h" 12 #include "core/style/ComputedStyle.h"
13 #include "platform/LengthFunctions.h" 13 #include "platform/LengthFunctions.h"
14 14
15 namespace blink { 15 namespace blink {
16 16
17 NGBlockLayoutAlgorithm::NGBlockLayoutAlgorithm( 17 NGBlockLayoutAlgorithm::NGBlockLayoutAlgorithm(
18 PassRefPtr<const ComputedStyle> style, 18 PassRefPtr<const ComputedStyle> style,
19 NGBoxIterator boxIterator) 19 NGBoxIterator boxIterator)
20 : m_style(style), m_boxIterator(boxIterator) {} 20 : m_style(style), m_boxIterator(boxIterator) {}
21 21
22 NGFragment* NGBlockLayoutAlgorithm::layout( 22 NGFragment* NGBlockLayoutAlgorithm::layout(
23 const NGConstraintSpace& constraintSpace) { 23 const NGConstraintSpace& constraintSpace) {
24 LayoutUnit inlineSize = 24 LayoutUnit inlineSize =
25 computeInlineSizeForFragment(constraintSpace, *m_style); 25 computeInlineSizeForFragment(constraintSpace, *m_style);
26 LayoutUnit blockSize =
27 computeBlockSizeForFragment(constraintSpace, *m_style, LayoutUnit(-1));
ikilpatrick 2016/08/23 00:49:04 Is the -1 correct? Should it be LayoutUnit(0) inst
cbiesinger 2016/08/23 01:06:54 They don't get resolved to zero -- indefinite perc
28 NGConstraintSpace constraint_space_for_children(
29 constraintSpace, NGLogicalSize(inlineSize, blockSize));
26 30
27 HeapVector<Member<const NGFragmentBase>> childFragments; 31 HeapVector<Member<const NGFragmentBase>> childFragments;
28 LayoutUnit contentSize; 32 LayoutUnit contentSize;
29 for (NGBox box : m_boxIterator) { 33 for (NGBox box : m_boxIterator) {
30 NGBoxMargins childMargins = computeMargins(constraintSpace, *box.style()); 34 NGBoxMargins childMargins =
31 NGFragment* fragment = box.layout(constraintSpace); 35 computeMargins(constraint_space_for_children, *box.style());
36 NGFragment* fragment = box.layout(constraint_space_for_children);
32 // TODO(layout-ng): Support auto margins 37 // TODO(layout-ng): Support auto margins
33 fragment->setOffset(childMargins.inlineStart, 38 fragment->setOffset(childMargins.inlineStart,
34 contentSize + childMargins.blockStart); 39 contentSize + childMargins.blockStart);
35 box.positionUpdated(*fragment); 40 box.positionUpdated(*fragment);
36 contentSize += fragment->blockSize() + childMargins.blockSum(); 41 contentSize += fragment->blockSize() + childMargins.blockSum();
37 childFragments.append(fragment); 42 childFragments.append(fragment);
38 } 43 }
39 44
40 LayoutUnit blockSize = 45 // Recompute the block-axis size now that we know our content size
ikilpatrick 2016/08/23 00:49:04 grammar-Nit: period and end? (I don't really care
cbiesinger 2016/08/23 01:06:54 Done.
46 blockSize =
41 computeBlockSizeForFragment(constraintSpace, *m_style, contentSize); 47 computeBlockSizeForFragment(constraintSpace, *m_style, contentSize);
42 NGFragment* returnFragment = 48 NGFragment* returnFragment =
43 new NGFragment(inlineSize, blockSize, inlineSize, blockSize, 49 new NGFragment(inlineSize, blockSize, inlineSize, blockSize,
44 HorizontalTopBottom, LeftToRight); 50 HorizontalTopBottom, LeftToRight);
45 returnFragment->swapChildren(childFragments); 51 returnFragment->swapChildren(childFragments);
46 return returnFragment; 52 return returnFragment;
47 } 53 }
48 54
49 } // namespace blink 55 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698