Commit 2915e022 authored by Christian Biesinger's avatar Christian Biesinger Committed by Commit Bot

[layoutng] Inline trivial functions of NGConstraintSpaceBuilder

R=ikilpatrick@chromium.org,eae@chromium.org

Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_layout_ng
Change-Id: I3836a9f162723371650e239918cc43412ab6c6c4
Reviewed-on: https://chromium-review.googlesource.com/c/1265066Reviewed-by: default avatarMorten Stenshorne <mstensho@chromium.org>
Commit-Queue: Christian Biesinger <cbiesinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#597205}
parent ab12365a
...@@ -26,73 +26,6 @@ NGConstraintSpaceBuilder::NGConstraintSpaceBuilder(WritingMode writing_mode, ...@@ -26,73 +26,6 @@ NGConstraintSpaceBuilder::NGConstraintSpaceBuilder(WritingMode writing_mode,
flags_ = NGConstraintSpace::kFixedSizeBlockIsDefinite; flags_ = NGConstraintSpace::kFixedSizeBlockIsDefinite;
} }
NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetAvailableSize(
NGLogicalSize available_size) {
available_size_ = available_size;
return *this;
}
NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetPercentageResolutionSize(
NGLogicalSize percentage_resolution_size) {
percentage_resolution_size_ = percentage_resolution_size;
return *this;
}
NGConstraintSpaceBuilder&
NGConstraintSpaceBuilder::SetReplacedPercentageResolutionSize(
NGLogicalSize replaced_percentage_resolution_size) {
replaced_percentage_resolution_size_ = replaced_percentage_resolution_size;
return *this;
}
NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetTextDirection(
TextDirection text_direction) {
text_direction_ = text_direction;
return *this;
}
NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetMarginStrut(
const NGMarginStrut& margin_strut) {
margin_strut_ = margin_strut;
return *this;
}
NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetBfcOffset(
const NGBfcOffset& bfc_offset) {
bfc_offset_ = bfc_offset;
return *this;
}
NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetFloatsBfcBlockOffset(
const base::Optional<LayoutUnit>& floats_bfc_block_offset) {
floats_bfc_block_offset_ = floats_bfc_block_offset;
return *this;
}
NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetClearanceOffset(
LayoutUnit clearance_offset) {
clearance_offset_ = clearance_offset;
return *this;
}
NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetExclusionSpace(
const NGExclusionSpace& exclusion_space) {
exclusion_space_ = &exclusion_space;
return *this;
}
NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetFragmentationType(
NGFragmentationType fragmentation_type) {
fragmentation_type_ = fragmentation_type;
return *this;
}
void NGConstraintSpaceBuilder::AddBaselineRequests(
const Vector<NGBaselineRequest>& requests) {
DCHECK(baseline_requests_.IsEmpty());
baseline_requests_.AppendVector(requests);
}
NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::AddBaselineRequest( NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::AddBaselineRequest(
const NGBaselineRequest& request) { const NGBaselineRequest& request) {
for (const auto& existing : baseline_requests_) { for (const auto& existing : baseline_requests_) {
...@@ -103,11 +36,4 @@ NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::AddBaselineRequest( ...@@ -103,11 +36,4 @@ NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::AddBaselineRequest(
return *this; return *this;
} }
const NGConstraintSpace NGConstraintSpaceBuilder::ToConstraintSpace(
WritingMode out_writing_mode) {
return NGConstraintSpace(out_writing_mode,
flags_ & NGConstraintSpace::kNewFormattingContext,
*this);
}
} // namespace blink } // namespace blink
...@@ -31,11 +31,22 @@ class CORE_EXPORT NGConstraintSpaceBuilder final { ...@@ -31,11 +31,22 @@ class CORE_EXPORT NGConstraintSpaceBuilder final {
// setters are in. // setters are in.
NGConstraintSpaceBuilder(WritingMode writing_mode, NGPhysicalSize icb_size); NGConstraintSpaceBuilder(WritingMode writing_mode, NGPhysicalSize icb_size);
NGConstraintSpaceBuilder& SetAvailableSize(NGLogicalSize available_size); NGConstraintSpaceBuilder& SetAvailableSize(NGLogicalSize available_size) {
available_size_ = available_size;
return *this;
}
NGConstraintSpaceBuilder& SetPercentageResolutionSize(NGLogicalSize); NGConstraintSpaceBuilder& SetPercentageResolutionSize(
NGLogicalSize percentage_resolution_size) {
percentage_resolution_size_ = percentage_resolution_size;
return *this;
}
NGConstraintSpaceBuilder& SetReplacedPercentageResolutionSize(NGLogicalSize); NGConstraintSpaceBuilder& SetReplacedPercentageResolutionSize(
NGLogicalSize replaced_percentage_resolution_size) {
replaced_percentage_resolution_size_ = replaced_percentage_resolution_size;
return *this;
}
NGConstraintSpaceBuilder& SetFragmentainerBlockSize(LayoutUnit size) { NGConstraintSpaceBuilder& SetFragmentainerBlockSize(LayoutUnit size) {
fragmentainer_block_size_ = size; fragmentainer_block_size_ = size;
...@@ -47,7 +58,10 @@ class CORE_EXPORT NGConstraintSpaceBuilder final { ...@@ -47,7 +58,10 @@ class CORE_EXPORT NGConstraintSpaceBuilder final {
return *this; return *this;
} }
NGConstraintSpaceBuilder& SetTextDirection(TextDirection); NGConstraintSpaceBuilder& SetTextDirection(TextDirection text_direction) {
text_direction_ = text_direction;
return *this;
}
NGConstraintSpaceBuilder& SetIsFixedSizeInline(bool b) { NGConstraintSpaceBuilder& SetIsFixedSizeInline(bool b) {
SetFlag(NGConstraintSpace::kFixedSizeInline, b); SetFlag(NGConstraintSpace::kFixedSizeInline, b);
...@@ -74,7 +88,11 @@ class CORE_EXPORT NGConstraintSpaceBuilder final { ...@@ -74,7 +88,11 @@ class CORE_EXPORT NGConstraintSpaceBuilder final {
return *this; return *this;
} }
NGConstraintSpaceBuilder& SetFragmentationType(NGFragmentationType); NGConstraintSpaceBuilder& SetFragmentationType(
NGFragmentationType fragmentation_type) {
fragmentation_type_ = fragmentation_type;
return *this;
}
NGConstraintSpaceBuilder& SetSeparateLeadingFragmentainerMargins(bool b) { NGConstraintSpaceBuilder& SetSeparateLeadingFragmentainerMargins(bool b) {
SetFlag(NGConstraintSpace::kSeparateLeadingFragmentainerMargins, b); SetFlag(NGConstraintSpace::kSeparateLeadingFragmentainerMargins, b);
...@@ -100,13 +118,25 @@ class CORE_EXPORT NGConstraintSpaceBuilder final { ...@@ -100,13 +118,25 @@ class CORE_EXPORT NGConstraintSpaceBuilder final {
return *this; return *this;
} }
NGConstraintSpaceBuilder& SetMarginStrut(const NGMarginStrut& margin_strut); NGConstraintSpaceBuilder& SetMarginStrut(const NGMarginStrut& margin_strut) {
margin_strut_ = margin_strut;
return *this;
}
NGConstraintSpaceBuilder& SetBfcOffset(const NGBfcOffset& bfc_offset); NGConstraintSpaceBuilder& SetBfcOffset(const NGBfcOffset& bfc_offset) {
bfc_offset_ = bfc_offset;
return *this;
}
NGConstraintSpaceBuilder& SetFloatsBfcBlockOffset( NGConstraintSpaceBuilder& SetFloatsBfcBlockOffset(
const base::Optional<LayoutUnit>&); const base::Optional<LayoutUnit>& floats_bfc_block_offset) {
floats_bfc_block_offset_ = floats_bfc_block_offset;
return *this;
}
NGConstraintSpaceBuilder& SetClearanceOffset(LayoutUnit clearance_offset); NGConstraintSpaceBuilder& SetClearanceOffset(LayoutUnit clearance_offset) {
clearance_offset_ = clearance_offset;
return *this;
}
NGConstraintSpaceBuilder& SetShouldForceClearance(bool b) { NGConstraintSpaceBuilder& SetShouldForceClearance(bool b) {
SetFlag(NGConstraintSpace::kForceClearance, b); SetFlag(NGConstraintSpace::kForceClearance, b);
...@@ -130,9 +160,15 @@ class CORE_EXPORT NGConstraintSpaceBuilder final { ...@@ -130,9 +160,15 @@ class CORE_EXPORT NGConstraintSpaceBuilder final {
} }
NGConstraintSpaceBuilder& SetExclusionSpace( NGConstraintSpaceBuilder& SetExclusionSpace(
const NGExclusionSpace& exclusion_space); const NGExclusionSpace& exclusion_space) {
exclusion_space_ = &exclusion_space;
return *this;
}
void AddBaselineRequests(const Vector<NGBaselineRequest>&); void AddBaselineRequests(const Vector<NGBaselineRequest>& requests) {
DCHECK(baseline_requests_.IsEmpty());
baseline_requests_.AppendVector(requests);
}
NGConstraintSpaceBuilder& AddBaselineRequest(const NGBaselineRequest&); NGConstraintSpaceBuilder& AddBaselineRequest(const NGBaselineRequest&);
// Creates a new constraint space. This may be called multiple times, for // Creates a new constraint space. This may be called multiple times, for
...@@ -143,7 +179,11 @@ class CORE_EXPORT NGConstraintSpaceBuilder final { ...@@ -143,7 +179,11 @@ class CORE_EXPORT NGConstraintSpaceBuilder final {
// - Has its size is determined by its parent layout (flex, abs-pos). // - Has its size is determined by its parent layout (flex, abs-pos).
// //
// WritingMode specifies the writing mode of the generated space. // WritingMode specifies the writing mode of the generated space.
const NGConstraintSpace ToConstraintSpace(WritingMode); const NGConstraintSpace ToConstraintSpace(WritingMode out_writing_mode) {
return NGConstraintSpace(out_writing_mode,
flags_ & NGConstraintSpace::kNewFormattingContext,
*this);
}
private: private:
void SetFlag(NGConstraintSpace::ConstraintSpaceFlags mask, bool value) { void SetFlag(NGConstraintSpace::ConstraintSpaceFlags mask, bool value) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment