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

Unified Diff: third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h

Issue 2614883007: Change computed style enums to be prefixed with 'k'. (Closed)
Patch Set: Rebase on ToT. 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/layout/line/BreakingContextInlineHeaders.h
diff --git a/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h b/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
index ebebad9d01599323b8c70232daa9f3f82b78d692..27c44facdd0fff74e8ea87ec723f6cb0d665cd94 100644
--- a/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
+++ b/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h
@@ -73,8 +73,8 @@ class BreakingContext {
m_lineInfo(inLineInfo),
m_layoutTextInfo(inLayoutTextInfo),
m_width(lineWidth),
- m_currWS(EWhiteSpace::Normal),
- m_lastWS(EWhiteSpace::Normal),
+ m_currWS(EWhiteSpace::kNormal),
+ m_lastWS(EWhiteSpace::kNormal),
m_preservesNewline(false),
m_atStart(true),
m_ignoringSpaces(false),
@@ -146,7 +146,7 @@ class BreakingContext {
InlineIterator handleEndOfLine();
void clearLineBreakIfFitsOnLine() {
- if (m_width.fitsOnLine() || m_lastWS == EWhiteSpace::Nowrap)
+ if (m_width.fitsOnLine() || m_lastWS == EWhiteSpace::kNowrap)
m_lineBreak.clear();
}
@@ -243,7 +243,7 @@ inline bool shouldCollapseWhiteSpace(const ComputedStyle& style,
// set to 'pre-wrap', UAs may visually collapse them.
return style.collapseWhiteSpace() ||
(whitespacePosition == TrailingWhitespace &&
- style.whiteSpace() == EWhiteSpace::PreWrap &&
+ style.whiteSpace() == EWhiteSpace::kPreWrap &&
(!lineInfo.isEmpty() || !lineInfo.previousLineBrokeCleanly()));
}
@@ -671,8 +671,8 @@ ALWAYS_INLINE TextDirection
textDirectionFromUnicode(WTF::Unicode::CharDirection direction) {
return direction == WTF::Unicode::RightToLeft ||
direction == WTF::Unicode::RightToLeftArabic
- ? TextDirection::Rtl
- : TextDirection::Ltr;
+ ? TextDirection::kRtl
+ : TextDirection::kLtr;
}
ALWAYS_INLINE float textWidth(
@@ -943,7 +943,7 @@ inline bool BreakingContext::handleText(WordMeasurements& wordMeasurements,
// on the line, that is, if |w| is zero.
bool breakWords = m_currentStyle->breakWords() &&
((m_autoWrap && !m_width.committedWidth()) ||
- m_currWS == EWhiteSpace::Pre);
+ m_currWS == EWhiteSpace::kPre);
bool midWordBreak = false;
bool breakAll =
m_currentStyle->wordBreak() == BreakAllWordBreak && m_autoWrap;
@@ -1033,7 +1033,7 @@ inline bool BreakingContext::handleText(WordMeasurements& wordMeasurements,
int nextBreakablePosition = m_current.nextBreakablePosition();
bool betweenWords =
c == newlineCharacter ||
- (m_currWS != EWhiteSpace::Pre && !m_atStart &&
+ (m_currWS != EWhiteSpace::kPre && !m_atStart &&
m_layoutTextInfo.m_lineBreakIterator.isBreakable(
m_current.offset(), nextBreakablePosition, lineBreakType) &&
(!disableSoftHyphen ||
@@ -1453,7 +1453,7 @@ inline bool BreakingContext::canBreakAtWhitespace(
inline void BreakingContext::commitAndUpdateLineBreakIfNeeded() {
bool checkForBreak = m_autoWrap;
if (m_width.committedWidth() && !m_width.fitsOnLine() &&
- m_lineBreak.getLineLayoutItem() && m_currWS == EWhiteSpace::Nowrap) {
+ m_lineBreak.getLineLayoutItem() && m_currWS == EWhiteSpace::kNowrap) {
if (m_width.fitsOnLine(0, ExcludeWhitespace)) {
m_width.commit();
m_lineBreak.moveToStartOf(m_nextObject);
« no previous file with comments | « third_party/WebKit/Source/core/layout/line/BreakingContext.cpp ('k') | third_party/WebKit/Source/core/layout/line/InlineBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698