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

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

Issue 2281153002: [layoutng] async layout part 1: Change the API to support async (Closed)
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_builder.h" 9 #include "core/layout/ng/ng_fragment_builder.h"
10 #include "core/layout/ng/ng_fragment.h" 10 #include "core/layout/ng/ng_fragment.h"
11 #include "core/layout/ng/ng_length_utils.h" 11 #include "core/layout/ng/ng_length_utils.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 box_iterator) 19 NGBoxIterator box_iterator)
20 : m_style(style), m_boxIterator(box_iterator) {} 20 : style_(style), box_iterator_(box_iterator) {}
21 21
22 NGFragment* NGBlockLayoutAlgorithm::layout( 22 bool NGBlockLayoutAlgorithm::Layout(const NGConstraintSpace* constraint_space,
23 const NGConstraintSpace* constraint_space) { 23 NGFragment** out) {
24 LayoutUnit inline_size = 24 LayoutUnit inline_size =
25 computeInlineSizeForFragment(*constraint_space, *m_style); 25 computeInlineSizeForFragment(*constraint_space, *style_);
26 // TODO(layout-ng): For quirks mode, should we pass blockSize instead of -1? 26 // TODO(layout-ng): For quirks mode, should we pass blockSize instead of -1?
27 LayoutUnit block_size = 27 LayoutUnit block_size =
28 computeBlockSizeForFragment(*constraint_space, *m_style, LayoutUnit(-1)); 28 computeBlockSizeForFragment(*constraint_space, *style_, LayoutUnit(-1));
29 NGConstraintSpace* constraint_space_for_children = new NGConstraintSpace( 29 NGConstraintSpace* constraint_space_for_children = new NGConstraintSpace(
30 *constraint_space, NGLogicalSize(inline_size, block_size)); 30 *constraint_space, NGLogicalSize(inline_size, block_size));
31 31
32 NGFragmentBuilder builder(NGFragmentBase::FragmentBox); 32 NGFragmentBuilder builder(NGFragmentBase::FragmentBox);
33 builder.SetInlineSize(inline_size).SetBlockSize(block_size); 33 builder.SetInlineSize(inline_size).SetBlockSize(block_size);
34 34
35 LayoutUnit content_size; 35 LayoutUnit content_size;
36 for (NGBox box : m_boxIterator) { 36 for (NGBox box : box_iterator_) {
37 NGBoxStrut child_margins = 37 NGBoxStrut child_margins =
38 computeMargins(*constraint_space_for_children, *box.style()); 38 computeMargins(*constraint_space_for_children, *box.style());
39 NGFragment* fragment = box.layout(constraint_space_for_children); 39 NGFragment* fragment;
40 // TODO(layout-ng): Actually make this async
41 while (!box.Layout(constraint_space_for_children, &fragment))
42 ;
40 // TODO(layout-ng): Support auto margins 43 // TODO(layout-ng): Support auto margins
41 fragment->SetOffset(child_margins.inline_start, 44 fragment->SetOffset(child_margins.inline_start,
42 content_size + child_margins.block_start); 45 content_size + child_margins.block_start);
43 box.positionUpdated(*fragment); 46 box.positionUpdated(*fragment);
44 content_size += fragment->BlockSize() + child_margins.BlockSum(); 47 content_size += fragment->BlockSize() + child_margins.BlockSum();
45 builder.AddChild(fragment); 48 builder.AddChild(fragment);
46 } 49 }
47 50
48 // Recompute the block-axis size now that we know our content size. 51 // Recompute the block-axis size now that we know our content size.
49 block_size = 52 block_size =
50 computeBlockSizeForFragment(*constraint_space, *m_style, content_size); 53 computeBlockSizeForFragment(*constraint_space, *style_, content_size);
51 54
52 // TODO(layout-ng): Compute correct inline overflow (block overflow should be 55 // TODO(layout-ng): Compute correct inline overflow (block overflow should be
53 // correct) 56 // correct)
54 builder.SetBlockSize(block_size) 57 builder.SetBlockSize(block_size)
55 .SetInlineOverflow(inline_size) 58 .SetInlineOverflow(inline_size)
56 .SetBlockOverflow(content_size); 59 .SetBlockOverflow(content_size);
57 return builder.ToFragment(); 60 *out = builder.ToFragment();
61 return true;
58 } 62 }
59 63
60 } // namespace blink 64 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698