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

Unified Diff: third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.cc

Issue 2451223003: Split SetFixedSize and SetDirectionTriggersScrollbar in multiple functions. (Closed)
Patch Set: Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3ab97a64e7dd7bbce1fbea503e82bd63a1c3310d..8f46932ec4e067b19f44c1f0577fd40278d402e0 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
@@ -7,7 +7,13 @@
namespace blink {
NGConstraintSpaceBuilder::NGConstraintSpaceBuilder(NGWritingMode writing_mode)
- : writing_mode_(writing_mode) {}
+ : 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) {}
NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetContainerSize(
NGLogicalSize container_size) {
@@ -15,20 +21,31 @@ NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetContainerSize(
return *this;
}
-NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetFixedSize(
- bool fixed_inline,
- bool fixed_block) {
- fixed_inline_ = fixed_inline;
- fixed_block_ = fixed_block;
+NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetIsFixedSizeInline(
+ bool is_fixed_size_inline) {
+ is_fixed_size_inline_ = is_fixed_size_inline;
+ return *this;
+}
+
+NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetIsFixedSizeBlock(
+ bool is_fixed_size_block) {
+ is_fixed_size_block_ = is_fixed_size_block;
+ return *this;
+}
+
+NGConstraintSpaceBuilder&
+NGConstraintSpaceBuilder::SetIsInlineDirectionTriggersScrollbar(
+ bool is_inline_direction_triggers_scrollbar) {
+ is_inline_direction_triggers_scrollbar_ =
+ is_inline_direction_triggers_scrollbar;
return *this;
}
NGConstraintSpaceBuilder&
-NGConstraintSpaceBuilder::SetOverflowTriggersScrollbar(
- bool inline_direction_triggers_scrollbar,
- bool block_direction_triggers_scrollbar) {
- inline_direction_triggers_scrollbar_ = inline_direction_triggers_scrollbar;
- block_direction_triggers_scrollbar_ = block_direction_triggers_scrollbar;
+NGConstraintSpaceBuilder::SetIsBlockDirectionTriggersScrollbar(
+ bool is_block_direction_triggers_scrollbar) {
+ is_block_direction_triggers_scrollbar_ =
+ is_block_direction_triggers_scrollbar;
return *this;
}
@@ -49,15 +66,15 @@ NGPhysicalConstraintSpace* NGConstraintSpaceBuilder::ToConstraintSpace() {
static_cast<NGWritingMode>(writing_mode_));
if (writing_mode_ == HorizontalTopBottom) {
return new NGPhysicalConstraintSpace(
- container_size, fixed_inline_, fixed_block_,
- inline_direction_triggers_scrollbar_,
- block_direction_triggers_scrollbar_, FragmentNone,
+ container_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(
- container_size, fixed_block_, fixed_inline_,
- block_direction_triggers_scrollbar_,
- inline_direction_triggers_scrollbar_,
+ container_size, is_fixed_size_block_, is_fixed_size_inline_,
+ is_block_direction_triggers_scrollbar_,
+ is_inline_direction_triggers_scrollbar_,
static_cast<NGFragmentationType>(fragmentation_type_), FragmentNone,
is_new_fc_);
}
« no previous file with comments | « third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698