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

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

Issue 2882903002: Make EOverflowWrap an enum class. (Closed)
Patch Set: Rebase 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 85beb8929917895f3efbf2782f12ee53af25a142..9facb6d1aae341f3017ceeb91072f37bdc9b67ab 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -1646,12 +1646,12 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>,
void SetWidows(short w) { SET_VAR(rare_inherited_data_, widows_, w); }
// overflow-wrap (aka word-wrap)
- static EOverflowWrap InitialOverflowWrap() { return kNormalOverflowWrap; }
+ static EOverflowWrap InitialOverflowWrap() { return EOverflowWrap::kNormal; }
EOverflowWrap OverflowWrap() const {
return static_cast<EOverflowWrap>(rare_inherited_data_->overflow_wrap_);
}
void SetOverflowWrap(EOverflowWrap b) {
- SET_VAR(rare_inherited_data_, overflow_wrap_, b);
+ SET_VAR(rare_inherited_data_, overflow_wrap_, static_cast<unsigned>(b));
}
// quotes
@@ -3367,7 +3367,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>,
bool BreakWords() const {
return (WordBreak() == kBreakWordBreak ||
- OverflowWrap() == kBreakOverflowWrap) &&
+ OverflowWrap() == EOverflowWrap::kBreakWord) &&
WhiteSpace() != EWhiteSpace::kPre &&
WhiteSpace() != EWhiteSpace::kNowrap;
}

Powered by Google App Engine
This is Rietveld 408576698