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

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

Issue 2230683003: [LayoutNG] Initial implementation of NGBoxIterator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: synced to the head Created 4 years, 4 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/style/ComputedStyle.h" 11 #include "core/style/ComputedStyle.h"
12 #include "platform/LengthFunctions.h" 12 #include "platform/LengthFunctions.h"
13 13
14 namespace blink { 14 namespace blink {
15 15
16 NGBlockLayoutAlgorithm::NGBlockLayoutAlgorithm( 16 NGBlockLayoutAlgorithm::NGBlockLayoutAlgorithm(
17 PassRefPtr<const ComputedStyle> style, 17 PassRefPtr<const ComputedStyle> style,
18 NGBox firstChild) 18 NGBoxIterator boxIterator)
19 : m_style(style), m_firstChild(firstChild) {} 19 : m_style(style), m_boxIterator(boxIterator) {}
20 20
21 NGFragment* NGBlockLayoutAlgorithm::layout( 21 NGFragment* NGBlockLayoutAlgorithm::layout(
22 const NGConstraintSpace& constraintSpace) { 22 const NGConstraintSpace& constraintSpace) {
23 LayoutUnit inlineSize = 23 LayoutUnit inlineSize =
24 computeInlineSizeForFragment(constraintSpace, *m_style); 24 computeInlineSizeForFragment(constraintSpace, *m_style);
25 25
26 HeapVector<Member<const NGFragmentBase>> childFragments; 26 HeapVector<Member<const NGFragmentBase>> childFragments;
27
28 LayoutUnit contentSize; 27 LayoutUnit contentSize;
29 for (NGBox curr = m_firstChild; curr; curr.nextSibling()) { 28 for (NGBox curr = m_boxIterator.first(); curr; m_boxIterator.next()) {
30 NGFragment* fragment = curr.layout(constraintSpace); 29 NGFragment* fragment = curr.layout(constraintSpace);
31 // TODO(layout-ng): Take margins into account 30 // TODO(layout-ng): Take margins into account
32 fragment->setOffset(LayoutUnit(), contentSize); 31 fragment->setOffset(LayoutUnit(), contentSize);
33 contentSize += fragment->blockSize(); 32 contentSize += fragment->blockSize();
34 childFragments.append(fragment); 33 childFragments.append(fragment);
35 } 34 }
36 35
37 LayoutUnit blockSize = 36 LayoutUnit blockSize =
38 computeBlockSizeForFragment(constraintSpace, *m_style, contentSize); 37 computeBlockSizeForFragment(constraintSpace, *m_style, contentSize);
39 NGFragment* returnFragment = new NGFragment( 38 NGFragment* returnFragment = new NGFragment(
40 inlineSize, blockSize, inlineSize, blockSize, 39 inlineSize, blockSize, inlineSize, blockSize,
41 NGFragmentBase::HorizontalTopBottom, NGFragmentBase::LeftToRight); 40 NGFragmentBase::HorizontalTopBottom, NGFragmentBase::LeftToRight);
42 returnFragment->swapChildren(childFragments); 41 returnFragment->swapChildren(childFragments);
43 return returnFragment; 42 return returnFragment;
44 } 43 }
45 44
46 } // namespace blink 45 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698