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

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

Issue 2264273003: [layoutng] LayoutOpportunities() only needs a bool, not an enum (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc » ('j') | 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.h
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h
index 1212027b12c77d0be1d4013fa634ff575cb32397..28be146e47020bdb6be8d2414b55ece8ba5744df 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h
+++ b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h
@@ -32,14 +32,6 @@ enum NGFragmentationType {
FragmentRegion
};
-enum NGExclusionFlowType {
- ExcludeNone,
- ExcludeInlineFlow,
- ExcludeInlineStart,
- ExcludeInlineEnd,
- ExcludeInlineBoth
-};
-
enum NGWritingMode {
HorizontalTopBottom = 0,
VerticalRightLeft = 1,
@@ -106,7 +98,7 @@ class CORE_EXPORT NGConstraintSpace {
NGLayoutOpportunityIterator layoutOpportunities(
unsigned clear = NGClearNone,
- NGExclusionFlowType avoid = ExcludeNone) const;
+ bool for_inline_or_bfc = false) const;
// Modifies constraint space to account for a placed fragment. Depending on
// the shape of the fragment this will either modify the inline or block
@@ -127,9 +119,12 @@ class CORE_EXPORT NGConstraintSpace {
class CORE_EXPORT NGLayoutOpportunityIterator final {
public:
- NGLayoutOpportunityIterator(const NGConstraintSpace* space, unsigned clear,
- NGExclusionFlowType avoid)
- : constraint_space_(space), clear_(clear), avoid_(avoid) {}
+ NGLayoutOpportunityIterator(const NGConstraintSpace* space,
+ unsigned clear,
+ bool for_inline_or_bfc)
+ : constraint_space_(space),
+ clear_(clear),
+ for_inline_or_bfc_(for_inline_or_bfc) {}
~NGLayoutOpportunityIterator() {}
const NGDerivedConstraintSpace* next();
@@ -137,7 +132,7 @@ class CORE_EXPORT NGLayoutOpportunityIterator final {
private:
const NGConstraintSpace* constraint_space_;
unsigned clear_;
- NGExclusionFlowType avoid_;
+ bool for_inline_or_bfc_;
};
} // namespace blink
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698