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

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

Issue 2457013004: Use NGLogicalRect instead of NGExclusion for exclusions. (Closed)
Patch Set: remove builder from NGLogicalRect Created 4 years, 1 month 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_physical_constraint_space.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_physical_constraint_space.cc b/third_party/WebKit/Source/core/layout/ng/ng_physical_constraint_space.cc
index 867519f34c581e4ff7ea4d798886cd2ede848eaa..b95fa48e9ce2b75cd2c153512323d41b47f5b8c2 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_physical_constraint_space.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_physical_constraint_space.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "core/layout/ng/ng_physical_constraint_space.h"
+#include "core/layout/ng/ptr_util.h"
namespace blink {
@@ -32,7 +33,8 @@ NGPhysicalConstraintSpace::NGPhysicalConstraintSpace(
width_direction_triggers_scrollbar_(0),
height_direction_triggers_scrollbar_(0),
width_direction_fragmentation_type_(FragmentNone),
- height_direction_fragmentation_type_(FragmentNone) {}
+ height_direction_fragmentation_type_(FragmentNone),
+ is_new_fc_(0) {}
NGPhysicalConstraintSpace::NGPhysicalConstraintSpace()
: fixed_width_(0),
@@ -40,14 +42,15 @@ NGPhysicalConstraintSpace::NGPhysicalConstraintSpace()
width_direction_triggers_scrollbar_(0),
height_direction_triggers_scrollbar_(0),
width_direction_fragmentation_type_(FragmentNone),
- height_direction_fragmentation_type_(FragmentNone) {}
+ height_direction_fragmentation_type_(FragmentNone),
+ is_new_fc_(0) {}
-void NGPhysicalConstraintSpace::AddExclusion(const NGExclusion* exclusion,
+void NGPhysicalConstraintSpace::AddExclusion(const NGLogicalRect& exclusion,
unsigned options) {
- exclusions_.append(exclusion);
+ exclusions_.append(MakeUnique<const NGLogicalRect>(exclusion));
ikilpatrick 2016/10/31 21:36:08 util the wtf ptr_util goes through can we just to
Gleb Lanbin 2016/10/31 23:08:18 Done.
}
-const HeapVector<Member<const NGExclusion>>&
+const Vector<std::unique_ptr<const NGLogicalRect>>&
NGPhysicalConstraintSpace::Exclusions(unsigned options) const {
// TODO(layout-ng): Filter based on options? Perhaps layout Opportunities
// should filter instead?

Powered by Google App Engine
This is Rietveld 408576698