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

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

Issue 2711803007: Add ClearanceOffset to LayoutNG Constraint space. (Closed)
Patch Set: update TestExpectations Created 3 years, 10 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_constraint_space.h" 5 #include "core/layout/ng/ng_constraint_space.h"
6 6
7 #include "core/layout/LayoutBlock.h" 7 #include "core/layout/LayoutBlock.h"
8 #include "core/layout/LayoutView.h" 8 #include "core/layout/LayoutView.h"
9 #include "core/layout/ng/ng_constraint_space_builder.h" 9 #include "core/layout/ng/ng_constraint_space_builder.h"
10 #include "core/layout/ng/ng_layout_opportunity_iterator.h" 10 #include "core/layout/ng/ng_layout_opportunity_iterator.h"
11 11
12 namespace blink { 12 namespace blink {
13 13
14 NGConstraintSpace::NGConstraintSpace( 14 NGConstraintSpace::NGConstraintSpace(
15 NGWritingMode writing_mode, 15 NGWritingMode writing_mode,
16 TextDirection direction, 16 TextDirection direction,
17 NGLogicalSize available_size, 17 NGLogicalSize available_size,
18 NGLogicalSize percentage_resolution_size, 18 NGLogicalSize percentage_resolution_size,
19 NGPhysicalSize initial_containing_block_size, 19 NGPhysicalSize initial_containing_block_size,
20 LayoutUnit fragmentainer_space_available, 20 LayoutUnit fragmentainer_space_available,
21 bool is_fixed_size_inline, 21 bool is_fixed_size_inline,
22 bool is_fixed_size_block, 22 bool is_fixed_size_block,
23 bool is_shrink_to_fit, 23 bool is_shrink_to_fit,
24 bool is_inline_direction_triggers_scrollbar, 24 bool is_inline_direction_triggers_scrollbar,
25 bool is_block_direction_triggers_scrollbar, 25 bool is_block_direction_triggers_scrollbar,
26 NGFragmentationType block_direction_fragmentation_type, 26 NGFragmentationType block_direction_fragmentation_type,
27 bool is_new_fc, 27 bool is_new_fc,
28 const NGMarginStrut& margin_strut, 28 const NGMarginStrut& margin_strut,
29 const NGLogicalOffset& bfc_offset, 29 const NGLogicalOffset& bfc_offset,
30 const std::shared_ptr<NGExclusions>& exclusions) 30 const std::shared_ptr<NGExclusions>& exclusions,
31 const WTF::Optional<LayoutUnit>& clearance_offset)
31 : available_size_(available_size), 32 : available_size_(available_size),
32 percentage_resolution_size_(percentage_resolution_size), 33 percentage_resolution_size_(percentage_resolution_size),
33 initial_containing_block_size_(initial_containing_block_size), 34 initial_containing_block_size_(initial_containing_block_size),
34 fragmentainer_space_available_(fragmentainer_space_available), 35 fragmentainer_space_available_(fragmentainer_space_available),
35 is_fixed_size_inline_(is_fixed_size_inline), 36 is_fixed_size_inline_(is_fixed_size_inline),
36 is_fixed_size_block_(is_fixed_size_block), 37 is_fixed_size_block_(is_fixed_size_block),
37 is_shrink_to_fit_(is_shrink_to_fit), 38 is_shrink_to_fit_(is_shrink_to_fit),
38 is_inline_direction_triggers_scrollbar_( 39 is_inline_direction_triggers_scrollbar_(
39 is_inline_direction_triggers_scrollbar), 40 is_inline_direction_triggers_scrollbar),
40 is_block_direction_triggers_scrollbar_( 41 is_block_direction_triggers_scrollbar_(
41 is_block_direction_triggers_scrollbar), 42 is_block_direction_triggers_scrollbar),
42 block_direction_fragmentation_type_(block_direction_fragmentation_type), 43 block_direction_fragmentation_type_(block_direction_fragmentation_type),
43 is_new_fc_(is_new_fc), 44 is_new_fc_(is_new_fc),
44 writing_mode_(writing_mode), 45 writing_mode_(writing_mode),
45 direction_(static_cast<unsigned>(direction)), 46 direction_(static_cast<unsigned>(direction)),
46 margin_strut_(margin_strut), 47 margin_strut_(margin_strut),
47 bfc_offset_(bfc_offset), 48 bfc_offset_(bfc_offset),
48 exclusions_(exclusions) {} 49 exclusions_(exclusions),
50 clearance_offset_(clearance_offset) {}
49 51
50 NGConstraintSpace* NGConstraintSpace::CreateFromLayoutObject( 52 NGConstraintSpace* NGConstraintSpace::CreateFromLayoutObject(
51 const LayoutBox& box) { 53 const LayoutBox& box) {
52 auto writing_mode = FromPlatformWritingMode(box.styleRef().getWritingMode()); 54 auto writing_mode = FromPlatformWritingMode(box.styleRef().getWritingMode());
53 bool parallel_containing_block = IsParallelWritingMode( 55 bool parallel_containing_block = IsParallelWritingMode(
54 FromPlatformWritingMode( 56 FromPlatformWritingMode(
55 box.containingBlock()->styleRef().getWritingMode()), 57 box.containingBlock()->styleRef().getWritingMode()),
56 writing_mode); 58 writing_mode);
57 bool fixed_inline = false, fixed_block = false; 59 bool fixed_inline = false, fixed_block = false;
58 60
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 124
123 NGFragmentationType NGConstraintSpace::BlockFragmentationType() const { 125 NGFragmentationType NGConstraintSpace::BlockFragmentationType() const {
124 return static_cast<NGFragmentationType>(block_direction_fragmentation_type_); 126 return static_cast<NGFragmentationType>(block_direction_fragmentation_type_);
125 } 127 }
126 128
127 void NGConstraintSpace::Subtract(const NGBoxFragment*) { 129 void NGConstraintSpace::Subtract(const NGBoxFragment*) {
128 // TODO(layout-ng): Implement. 130 // TODO(layout-ng): Implement.
129 } 131 }
130 132
131 String NGConstraintSpace::ToString() const { 133 String NGConstraintSpace::ToString() const {
132 return String::format("Offset: %s,%s Size: %sx%s MarginStrut: %s", 134 return String::format(
133 bfc_offset_.inline_offset.toString().ascii().data(), 135 "Offset: %s,%s Size: %sx%s MarginStrut: %s"
134 bfc_offset_.block_offset.toString().ascii().data(), 136 " Clearance: %s",
135 AvailableSize().inline_size.toString().ascii().data(), 137 bfc_offset_.inline_offset.toString().ascii().data(),
136 AvailableSize().block_size.toString().ascii().data(), 138 bfc_offset_.block_offset.toString().ascii().data(),
137 margin_strut_.ToString().ascii().data()); 139 AvailableSize().inline_size.toString().ascii().data(),
140 AvailableSize().block_size.toString().ascii().data(),
141 margin_strut_.ToString().ascii().data(),
142 clearance_offset_.has_value()
143 ? clearance_offset_.value().toString().ascii().data()
144 : "none");
138 } 145 }
139 146
140 } // namespace blink 147 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698