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

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

Issue 2456193002: [LayoutNG] Remove last NGConstraintSpace constructor. (Closed)
Patch Set: address comment. 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
Index: third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc
index 3327f4e7ec07aac793a2fb9e380666812c938e49..199fee72ea41e2c4d77e53e584a7bcb198b4330a 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc
@@ -6,6 +6,8 @@
#include "core/layout/LayoutBlock.h"
#include "core/layout/LayoutView.h"
+#include "core/layout/ng/ng_constraint_space.h"
+#include "core/layout/ng/ng_constraint_space_builder.h"
#include "core/layout/ng/ng_layout_opportunity_iterator.h"
#include "core/layout/ng/ng_units.h"
@@ -21,15 +23,6 @@ NGConstraintSpace::NGConstraintSpace(NGWritingMode writing_mode,
NGConstraintSpace::NGConstraintSpace(NGWritingMode writing_mode,
NGDirection direction,
- NGLogicalSize container_size)
- : physical_space_(new NGPhysicalConstraintSpace(
- container_size.ConvertToPhysical(writing_mode))),
- size_(container_size),
- writing_mode_(writing_mode),
- direction_(direction) {}
-
-NGConstraintSpace::NGConstraintSpace(NGWritingMode writing_mode,
- NGDirection direction,
const NGConstraintSpace& other,
NGLogicalSize size)
: size_(size), writing_mode_(writing_mode), direction_(direction) {
@@ -70,17 +63,23 @@ NGConstraintSpace* NGConstraintSpace::CreateFromLayoutObject(
if (box.isLayoutBlock() && toLayoutBlock(box).createsNewFormattingContext())
is_new_fc = true;
- NGConstraintSpace* derived_constraint_space = new NGConstraintSpace(
+ NGConstraintSpaceBuilder builder(
+ FromPlatformWritingMode(box.styleRef().getWritingMode()));
+ builder
+ .SetContainerSize(
+ NGLogicalSize(container_logical_width, container_logical_height))
+ .SetIsInlineDirectionTriggersScrollbar(
+ box.styleRef().overflowInlineDirection() == OverflowAuto)
+ .SetIsBlockDirectionTriggersScrollbar(
+ box.styleRef().overflowBlockDirection() == OverflowAuto)
+ .SetIsFixedSizeInline(fixed_inline)
+ .SetIsFixedSizeBlock(fixed_block)
+ .SetIsNewFormattingContext(is_new_fc);
+
+ return new NGConstraintSpace(
FromPlatformWritingMode(box.styleRef().getWritingMode()),
FromPlatformDirection(box.styleRef().direction()),
- NGLogicalSize(container_logical_width, container_logical_height));
- derived_constraint_space->SetOverflowTriggersScrollbar(
- box.styleRef().overflowInlineDirection() == OverflowAuto,
- box.styleRef().overflowBlockDirection() == OverflowAuto);
- derived_constraint_space->SetFixedSize(fixed_inline, fixed_block);
- derived_constraint_space->SetIsNewFormattingContext(is_new_fc);
-
- return derived_constraint_space;
+ builder.ToConstraintSpace());
}
void NGConstraintSpace::AddExclusion(const NGExclusion* exclusion) const {

Powered by Google App Engine
This is Rietveld 408576698