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

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

Issue 2299823002: [LayoutNG] Merge NGDerivedConstraintSpace into NGConstraintSpace (Closed)
Patch Set: Fix copy constructors Created 4 years, 4 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_length_utils_test.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_length_utils_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_length_utils_test.cc
index d01ff4755e7b967aa27926583f57eac3925362d5..11fbee88e9b5ba5a7d766da86e4ec415bb7bf1c5 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_length_utils_test.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_length_utils_test.cc
@@ -5,7 +5,6 @@
#include "core/layout/ng/ng_length_utils.h"
#include "core/layout/ng/ng_constraint_space.h"
-#include "core/layout/ng/ng_derived_constraint_space.h"
#include "core/layout/ng/ng_margin_strut.h"
#include "core/style/ComputedStyle.h"
#include "platform/CalculationValue.h"
@@ -25,10 +24,12 @@ class NGLengthUtilsTest : public ::testing::Test {
int block_size,
bool fixed_inline = false,
bool fixed_block = false) {
- return new NGDerivedConstraintSpace(
+ NGConstraintSpace* derived_constraint_space = new NGConstraintSpace(
HorizontalTopBottom,
- NGLogicalSize(LayoutUnit(inline_size), LayoutUnit(block_size)), false,
- false, fixed_inline, fixed_block, FragmentNone);
+ NGLogicalSize(LayoutUnit(inline_size), LayoutUnit(block_size)));
+ derived_constraint_space->SetOverflowTriggersScrollbar(false, false);
+ derived_constraint_space->SetFixedSize(fixed_inline, fixed_block);
+ return derived_constraint_space;
}
LayoutUnit resolveInlineLength(

Powered by Google App Engine
This is Rietveld 408576698