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

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

Issue 2653123002: Changed EClear to an enum class and renamed its members (Closed)
Patch Set: Rebase Created 3 years, 11 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
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 3cad814d0a04cde387afbf0bfe434cd602ece8a0..d7a251f4d38f99e69aae3042d8cd45742a049e49 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -313,7 +313,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
m_nonInheritedData.m_overflowY = static_cast<unsigned>(initialOverflowY());
m_nonInheritedData.m_verticalAlign =
static_cast<unsigned>(initialVerticalAlign());
- m_nonInheritedData.m_clear = initialClear();
+ m_nonInheritedData.m_clear = static_cast<unsigned>(initialClear());
m_nonInheritedData.m_position = initialPosition();
m_nonInheritedData.m_tableLayout =
static_cast<unsigned>(initialTableLayout());
@@ -767,11 +767,13 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
}
// clear
- static EClear initialClear() { return ClearNone; }
+ static EClear initialClear() { return EClear::kNone; }
EClear clear() const {
return static_cast<EClear>(m_nonInheritedData.m_clear);
}
- void setClear(EClear v) { m_nonInheritedData.m_clear = v; }
+ void setClear(EClear v) {
+ m_nonInheritedData.m_clear = static_cast<unsigned>(v);
+ }
// Page break properties.
// break-after (shorthand for page-break-after and -webkit-column-break-after)

Powered by Google App Engine
This is Rietveld 408576698