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

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

Issue 2223163002: [layoutng] Rename exclusion types to avoid conflicts with ComputedStyleConstants.h (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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698