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

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

Issue 2346403002: [layoutng] Create correct constraint spaces for children (Closed)
Patch Set: fix assert failures Created 4 years, 3 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 c167b9dc0baa47db9f10ba5a7aaf2830c2a5cf2b..02693255a549f85cf0ff273450a814204c832e37 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
@@ -11,9 +11,6 @@
namespace blink {
-// TODO: This should set the size of the NGPhysicalConstraintSpace. Or we could
-// remove it requiring that a NGConstraintSpace is created from a
-// NGPhysicalConstraintSpace.
NGConstraintSpace::NGConstraintSpace(NGWritingMode writing_mode,
NGDirection direction,
NGLogicalSize container_size)
@@ -40,17 +37,6 @@ NGConstraintSpace::NGConstraintSpace(NGWritingMode writing_mode,
writing_mode_(writing_mode),
direction_(direction) {}
-NGConstraintSpace::NGConstraintSpace(NGWritingMode writing_mode,
- NGDirection direction,
- const NGConstraintSpace& other,
- NGLogicalOffset offset,
- NGLogicalSize size)
- : physical_space_(other.PhysicalSpace()),
- offset_(offset),
- size_(size),
- writing_mode_(writing_mode),
- direction_(direction) {}
-
NGConstraintSpace::NGConstraintSpace(const NGConstraintSpace& other,
NGLogicalOffset offset,
NGLogicalSize size)
@@ -60,6 +46,18 @@ NGConstraintSpace::NGConstraintSpace(const NGConstraintSpace& other,
writing_mode_(other.WritingMode()),
direction_(other.Direction()) {}
+NGConstraintSpace::NGConstraintSpace(NGWritingMode writing_mode,
+ NGDirection direction,
+ const NGConstraintSpace& other,
+ NGLogicalSize size)
+ : size_(size), writing_mode_(writing_mode), direction_(direction) {
+ physical_space_ =
+ new NGPhysicalConstraintSpace(size.ConvertToPhysical(writing_mode));
+ for (const NGExclusion& exclusion : other.PhysicalSpace()->Exclusions()) {
+ physical_space_->AddExclusion(exclusion);
+ }
+}
+
NGConstraintSpace* NGConstraintSpace::CreateFromLayoutObject(
const LayoutBox& box) {
bool fixed_inline = false, fixed_block = false;

Powered by Google App Engine
This is Rietveld 408576698