Index: third_party/WebKit/Source/core/layout/ng/NGConstraintSpace.h |
diff --git a/third_party/WebKit/Source/core/layout/ng/NGConstraintSpace.h b/third_party/WebKit/Source/core/layout/ng/NGConstraintSpace.h |
index e6d8536b8c4346459bf4a653ad70744a480eb4ae..d0d9a1fe30c27abcb0203a3f9ee7abe8e8b71698 100644 |
--- a/third_party/WebKit/Source/core/layout/ng/NGConstraintSpace.h |
+++ b/third_party/WebKit/Source/core/layout/ng/NGConstraintSpace.h |
@@ -17,10 +17,10 @@ class NGFragment; |
class NGLayoutOpportunityIterator; |
enum NGExclusionType { |
- ClearNone = 0, |
- ClearFloatLeft = 1, |
- ClearFloatRight = 2, |
- ClearFragment = 4 |
+ NGClearNone = 0, |
+ NGClearFloatLeft = 1, |
+ NGClearFloatRight = 2, |
+ NGClearFragment = 4 |
}; |
enum NGFragmentationType { |
@@ -102,7 +102,7 @@ public: |
DoublyLinkedList<const NGExclusion> exclusions(unsigned options = 0) const; |
NGLayoutOpportunityIterator layoutOpportunities( |
- unsigned clear = ClearNone, |
+ unsigned clear = NGClearNone, |
NGExclusionFlowType avoid = ExcludeNone) const; |
// Modifies constraint space to account for a placed fragment. Depending on |