Remove shadowing of kMeasure in blink by using enum class
There are several kMeasure in blink and with -Wshadow enabled
there will be warnings about blink::kMeasure being shadowed.
This moves blink::kMeasure to
blink::NGTableCellChildLayoutPhase::kMeasure which avoid that
warning.
I'm interested in making blink -Wshadow clean because I think that
can reduce the risk of certain jumbo problems.
Bug: 923510
Change-Id: Ifac4ce2c9cf61ee7e7d72da4dc5055d4f490a5cc
Reviewed-on: https://chromium-review.googlesource.com/c/1484309
Reviewed-by: Anders Hartvoll Ruud <andruud@chromium.org>
Reviewed-by: Ian Kilpatrick <ikilpatrick@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#635090}diff --git a/third_party/blink/renderer/core/layout/ng/ng_constraint_space.h b/third_party/blink/renderer/core/layout/ng/ng_constraint_space.h
index 621d6769..6e042ea 100644
--- a/third_party/blink/renderer/core/layout/ng/ng_constraint_space.h
+++ b/third_party/blink/renderer/core/layout/ng/ng_constraint_space.h
@@ -37,7 +37,7 @@
//
// This enum is used for communicating to *direct* children of table cells,
// which layout phase the table cell is in.
-enum NGTableCellChildLayoutPhase {
+enum class NGTableCellChildLayoutPhase {
kNotTableCellChild, // The node isn't a table cell child.
kMeasure, // The node is a table cell child, in the "measure" phase.
kLayout // The node is a table cell child, in the "layout" phase.
@@ -555,8 +555,8 @@
Bitfields() : Bitfields(WritingMode::kHorizontalTb) {}
explicit Bitfields(WritingMode writing_mode)
- : table_cell_child_layout_phase(
- static_cast<unsigned>(kNotTableCellChild)),
+ : table_cell_child_layout_phase(static_cast<unsigned>(
+ NGTableCellChildLayoutPhase::kNotTableCellChild)),
adjoining_floats(static_cast<unsigned>(kFloatTypeNone)),
writing_mode(static_cast<unsigned>(writing_mode)),
direction(static_cast<unsigned>(TextDirection::kLtr)),
diff --git a/third_party/blink/renderer/core/layout/ng/ng_constraint_space_builder.h b/third_party/blink/renderer/core/layout/ng/ng_constraint_space_builder.h
index e7a0eea..41670b6f 100644
--- a/third_party/blink/renderer/core/layout/ng/ng_constraint_space_builder.h
+++ b/third_party/blink/renderer/core/layout/ng/ng_constraint_space_builder.h
@@ -245,7 +245,7 @@
NGConstraintSpaceBuilder& SetTableCellChildLayoutPhase(
NGTableCellChildLayoutPhase table_cell_child_layout_phase) {
space_.bitfields_.table_cell_child_layout_phase =
- table_cell_child_layout_phase;
+ static_cast<unsigned>(table_cell_child_layout_phase);
return *this;
}
