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

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

Issue 2877333002: Make EWordBreak an enum class. (Closed)
Patch Set: Release Created 3 years, 7 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 04e113b0c6c1a54e29dbe7e3a727c07ea75c4adb..7dc5a9f7d51be16c9c834b41a92604bc361d6bbf 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -1769,12 +1769,12 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>,
}
// word-break inherited (aka -epub-word-break)
- static EWordBreak InitialWordBreak() { return kNormalWordBreak; }
+ static EWordBreak InitialWordBreak() { return EWordBreak::kNormal; }
EWordBreak WordBreak() const {
return static_cast<EWordBreak>(rare_inherited_data_->word_break_);
}
void SetWordBreak(EWordBreak b) {
- SET_VAR(rare_inherited_data_, word_break_, b);
+ SET_VAR(rare_inherited_data_, word_break_, static_cast<unsigned>(b));
}
// -webkit-line-break
@@ -3368,7 +3368,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>,
}
bool BreakWords() const {
- return (WordBreak() == kBreakWordBreak ||
+ return (WordBreak() == EWordBreak::kBreakWord ||
OverflowWrap() == EOverflowWrap::kBreakWord) &&
WhiteSpace() != EWhiteSpace::kPre &&
WhiteSpace() != EWhiteSpace::kNowrap;

Powered by Google App Engine
This is Rietveld 408576698