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

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

Issue 2591373003: Changed WritingMode 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..ed163808f2b9c9d962b5204ed101313c378d6fef 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -320,7 +320,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
m_inheritedData.m_direction = initialDirection();
m_inheritedData.m_rtlOrdering = static_cast<unsigned>(initialRTLOrdering());
m_inheritedData.m_insideLink = NotInsideLink;
- m_inheritedData.m_writingMode = initialWritingMode();
+ m_inheritedData.m_writingMode = static_cast<unsigned>(initialWritingMode());
m_nonInheritedData.m_effectiveDisplay =
m_nonInheritedData.m_originalDisplay =
@@ -2213,11 +2213,13 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
void setLineBreak(LineBreak b) { SET_VAR(m_rareInheritedData, lineBreak, b); }
// writing-mode (aka -webkit-writing-mode, -epub-writing-mode)
- static WritingMode initialWritingMode() { return TopToBottomWritingMode; }
+ static WritingMode initialWritingMode() { return WritingMode::HorizontalTb; }
WritingMode getWritingMode() const {
return static_cast<WritingMode>(m_inheritedData.m_writingMode);
}
- void setWritingMode(WritingMode v) { m_inheritedData.m_writingMode = v; }
+ void setWritingMode(WritingMode v) {
+ m_inheritedData.m_writingMode = static_cast<unsigned>(v);
+ }
// Text emphasis properties.
static TextEmphasisFill initialTextEmphasisFill() {

Powered by Google App Engine
This is Rietveld 408576698