| Index: third_party/WebKit/Source/core/layout/LayoutTable.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutTable.cpp b/third_party/WebKit/Source/core/layout/LayoutTable.cpp
|
| index ea658b4d04d0874bae590dd6f353218885e48aeb..a60abf0d658c3524fd18737bcf3cf481e0eadc19 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutTable.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutTable.cpp
|
| @@ -120,9 +120,9 @@ static inline bool needsTableSection(LayoutObject* object) {
|
| // Return true if 'object' can't exist in an anonymous table without being
|
| // wrapped in a table section box.
|
| EDisplay display = object->style()->display();
|
| - return display != EDisplay::TableCaption &&
|
| - display != EDisplay::TableColumnGroup &&
|
| - display != EDisplay::TableColumn;
|
| + return display != EDisplay::kTableCaption &&
|
| + display != EDisplay::kTableColumnGroup &&
|
| + display != EDisplay::kTableColumn;
|
| }
|
|
|
| void LayoutTable::addChild(LayoutObject* child, LayoutObject* beforeChild) {
|
| @@ -135,7 +135,7 @@ void LayoutTable::addChild(LayoutObject* child, LayoutObject* beforeChild) {
|
| wrapInAnonymousSection = false;
|
| } else if (child->isTableSection()) {
|
| switch (child->style()->display()) {
|
| - case EDisplay::TableHeaderGroup:
|
| + case EDisplay::kTableHeaderGroup:
|
| resetSectionPointerIfNotBefore(m_head, beforeChild);
|
| if (!m_head) {
|
| m_head = toLayoutTableSection(child);
|
| @@ -146,7 +146,7 @@ void LayoutTable::addChild(LayoutObject* child, LayoutObject* beforeChild) {
|
| }
|
| wrapInAnonymousSection = false;
|
| break;
|
| - case EDisplay::TableFooterGroup:
|
| + case EDisplay::kTableFooterGroup:
|
| resetSectionPointerIfNotBefore(m_foot, beforeChild);
|
| if (!m_foot) {
|
| m_foot = toLayoutTableSection(child);
|
| @@ -154,7 +154,7 @@ void LayoutTable::addChild(LayoutObject* child, LayoutObject* beforeChild) {
|
| break;
|
| }
|
| // Fall through.
|
| - case EDisplay::TableRowGroup:
|
| + case EDisplay::kTableRowGroup:
|
| resetSectionPointerIfNotBefore(m_firstBody, beforeChild);
|
| if (!m_firstBody)
|
| m_firstBody = toLayoutTableSection(child);
|
| @@ -1081,11 +1081,11 @@ void LayoutTable::recalcSections() const {
|
| for (LayoutObject* child = firstChild(); child; child = nextSibling) {
|
| nextSibling = child->nextSibling();
|
| switch (child->style()->display()) {
|
| - case EDisplay::TableColumn:
|
| - case EDisplay::TableColumnGroup:
|
| + case EDisplay::kTableColumn:
|
| + case EDisplay::kTableColumnGroup:
|
| m_hasColElements = true;
|
| break;
|
| - case EDisplay::TableHeaderGroup:
|
| + case EDisplay::kTableHeaderGroup:
|
| if (child->isTableSection()) {
|
| LayoutTableSection* section = toLayoutTableSection(child);
|
| if (!m_head)
|
| @@ -1095,7 +1095,7 @@ void LayoutTable::recalcSections() const {
|
| section->recalcCellsIfNeeded();
|
| }
|
| break;
|
| - case EDisplay::TableFooterGroup:
|
| + case EDisplay::kTableFooterGroup:
|
| if (child->isTableSection()) {
|
| LayoutTableSection* section = toLayoutTableSection(child);
|
| if (!m_foot)
|
| @@ -1105,7 +1105,7 @@ void LayoutTable::recalcSections() const {
|
| section->recalcCellsIfNeeded();
|
| }
|
| break;
|
| - case EDisplay::TableRowGroup:
|
| + case EDisplay::kTableRowGroup:
|
| if (child->isTableSection()) {
|
| LayoutTableSection* section = toLayoutTableSection(child);
|
| if (!m_firstBody)
|
| @@ -1645,7 +1645,7 @@ LayoutTable* LayoutTable::createAnonymousWithParent(
|
| RefPtr<ComputedStyle> newStyle =
|
| ComputedStyle::createAnonymousStyleWithDisplay(
|
| parent->styleRef(),
|
| - parent->isLayoutInline() ? EDisplay::InlineTable : EDisplay::Table);
|
| + parent->isLayoutInline() ? EDisplay::kInlineTable : EDisplay::kTable);
|
| LayoutTable* newTable = new LayoutTable(nullptr);
|
| newTable->setDocumentForAnonymous(&parent->document());
|
| newTable->setStyle(std::move(newStyle));
|
|
|