Index: third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.cc |
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.cc b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.cc |
index e3f0f37b7e5266688df3a38823c006c19f4e1bb7..77d8ab907e3a98127b78e26594ca627de093fb22 100644 |
--- a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.cc |
+++ b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.cc |
@@ -6,14 +6,34 @@ |
namespace blink { |
+NGConstraintSpaceBuilder::NGConstraintSpaceBuilder( |
+ const NGConstraintSpace* parent_space) |
+ : available_size_(parent_space->AvailableSize()), |
+ percentage_resolution_size_(parent_space->PercentageResolutionSize()), |
+ writing_mode_(parent_space->WritingMode()), |
+ parent_writing_mode_(writing_mode_), |
+ is_fixed_size_inline_(parent_space->IsFixedSizeInline()), |
ikilpatrick
2016/11/29 00:10:27
for most of these we may want to set them to defau
Gleb Lanbin
2016/12/01 20:41:53
Done.
|
+ is_fixed_size_block_(parent_space->IsFixedSizeBlock()), |
+ is_inline_direction_triggers_scrollbar_( |
+ parent_space->IsInlineDirectionTriggersScrollbar()), |
+ is_block_direction_triggers_scrollbar_( |
+ parent_space->IsBlockDirectionTriggersScrollbar()), |
+ fragmentation_type_(NGFragmentationType::FragmentNone), |
+ is_new_fc_(parent_space->IsNewFormattingContext()), |
+ text_direction_(parent_space->Direction()), |
+ exclusions_(parent_space->Exclusions()) {} |
+ |
NGConstraintSpaceBuilder::NGConstraintSpaceBuilder(NGWritingMode writing_mode) |
: writing_mode_(writing_mode), |
+ parent_writing_mode_(writing_mode_), |
is_fixed_size_inline_(false), |
is_fixed_size_block_(false), |
is_inline_direction_triggers_scrollbar_(false), |
is_block_direction_triggers_scrollbar_(false), |
fragmentation_type_(NGFragmentationType::FragmentNone), |
- is_new_fc_(false) {} |
+ is_new_fc_(false), |
+ text_direction_(TextDirection::LTR), |
+ exclusions_(new NGExclusions()) {} |
NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetAvailableSize( |
NGLogicalSize available_size) { |
@@ -27,6 +47,12 @@ NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetPercentageResolutionSize( |
return *this; |
} |
+NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetTextDirection( |
+ TextDirection text_direction) { |
+ text_direction_ = text_direction; |
+ return *this; |
+} |
+ |
NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetIsFixedSizeInline( |
bool is_fixed_size_inline) { |
is_fixed_size_inline_ = is_fixed_size_inline; |
@@ -67,27 +93,42 @@ NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetIsNewFormattingContext( |
return *this; |
} |
-NGPhysicalConstraintSpace* NGConstraintSpaceBuilder::ToConstraintSpace() { |
- NGPhysicalSize available_size = available_size_.ConvertToPhysical( |
- static_cast<NGWritingMode>(writing_mode_)); |
- NGPhysicalSize percentage_resolution_size = |
- percentage_resolution_size_.ConvertToPhysical( |
- static_cast<NGWritingMode>(writing_mode_)); |
- |
- if (writing_mode_ == HorizontalTopBottom) { |
- return new NGPhysicalConstraintSpace( |
- available_size, percentage_resolution_size, is_fixed_size_inline_, |
- is_fixed_size_block_, is_inline_direction_triggers_scrollbar_, |
- is_block_direction_triggers_scrollbar_, FragmentNone, |
- static_cast<NGFragmentationType>(fragmentation_type_), is_new_fc_); |
- } else { |
- return new NGPhysicalConstraintSpace( |
- available_size, percentage_resolution_size, is_fixed_size_block_, |
- is_fixed_size_inline_, is_block_direction_triggers_scrollbar_, |
+NGConstraintSpace* NGConstraintSpaceBuilder::ToConstraintSpace() { |
+ // Exclusions do not pass the formatting context boundary. |
+ std::shared_ptr<NGExclusions> exclusions( |
+ is_new_fc_ ? std::make_shared<NGExclusions>() : exclusions_); |
+ |
+ // Whether the child and the containing block are parallel to each other. |
+ // Example: vertical-rl and vertical-lr |
ikilpatrick
2016/11/29 00:10:27
nice comment. :)
Gleb Lanbin
2016/12/01 20:41:53
Acknowledged.
|
+ bool is_in_parallel_flow = |
+ (parent_writing_mode_ == NGWritingMode::HorizontalTopBottom) == |
+ (writing_mode_ == NGWritingMode::HorizontalTopBottom); |
+ |
+ if (is_in_parallel_flow) { |
+ return new NGConstraintSpace( |
+ static_cast<NGWritingMode>(writing_mode_), |
+ static_cast<TextDirection>(text_direction_), |
+ {available_size_.inline_size, available_size_.block_size}, |
+ {percentage_resolution_size_.inline_size, |
+ percentage_resolution_size_.block_size}, |
+ is_fixed_size_inline_, is_fixed_size_block_, |
is_inline_direction_triggers_scrollbar_, |
- static_cast<NGFragmentationType>(fragmentation_type_), FragmentNone, |
- is_new_fc_); |
+ is_block_direction_triggers_scrollbar_, |
+ static_cast<NGFragmentationType>(fragmentation_type_), is_new_fc_, |
+ exclusions); |
} |
+ |
+ return new NGConstraintSpace( |
+ static_cast<NGWritingMode>(writing_mode_), |
+ static_cast<TextDirection>(text_direction_), |
+ {available_size_.block_size, available_size_.inline_size}, |
+ {percentage_resolution_size_.block_size, |
+ percentage_resolution_size_.inline_size}, |
+ is_fixed_size_block_, is_fixed_size_inline_, |
+ is_block_direction_triggers_scrollbar_, |
+ is_inline_direction_triggers_scrollbar_, |
+ static_cast<NGFragmentationType>(fragmentation_type_), is_new_fc_, |
+ exclusions); |
} |
} // namespace blink |