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

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 2578403002: Changed EVerticalAlign to an enum class and renamed its members (Closed)
Patch Set: Created 4 years 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
Index: third_party/WebKit/Source/core/style/ComputedStyle.h
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
index a6e7ba13336787390864d67709d314c425abf2be..48edb106c00692410d0287ed45eabafebbb25ea7 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -329,7 +329,8 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
static_cast<unsigned>(initialOverflowAnchor());
m_nonInheritedData.m_overflowX = static_cast<unsigned>(initialOverflowX());
m_nonInheritedData.m_overflowY = static_cast<unsigned>(initialOverflowY());
- m_nonInheritedData.m_verticalAlign = initialVerticalAlign();
+ m_nonInheritedData.m_verticalAlign =
+ static_cast<unsigned>(initialVerticalAlign());
m_nonInheritedData.m_clear = initialClear();
m_nonInheritedData.m_position = initialPosition();
m_nonInheritedData.m_tableLayout = initialTableLayout();
@@ -1878,7 +1879,9 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
void setUnicodeBidi(EUnicodeBidi b) { m_nonInheritedData.m_unicodeBidi = b; }
// vertical-align
- static EVerticalAlign initialVerticalAlign() { return VerticalAlignBaseline; }
+ static EVerticalAlign initialVerticalAlign() {
+ return EVerticalAlign::Baseline;
+ }
EVerticalAlign verticalAlign() const {
return static_cast<EVerticalAlign>(m_nonInheritedData.m_verticalAlign);
}
@@ -1886,10 +1889,10 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
return m_box->verticalAlign();
}
void setVerticalAlign(EVerticalAlign v) {
- m_nonInheritedData.m_verticalAlign = v;
+ m_nonInheritedData.m_verticalAlign = static_cast<unsigned>(v);
}
void setVerticalAlignLength(const Length& length) {
- setVerticalAlign(VerticalAlignLength);
+ setVerticalAlign(EVerticalAlign::Length);
SET_VAR(m_box, m_verticalAlign, length);
}

Powered by Google App Engine
This is Rietveld 408576698