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

Unified Diff: third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp

Issue 2555923002: Changed TextDirection to an enum class and renamed its members (Closed)
Patch Set: Rebase after reopen 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/paint/InlineTextBoxPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp b/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
index 331a90d49a7568ae087ea337de666d3aeba8744a..38a3dfd9277987a42d7a03d52558a98d161e7b9e 100644
--- a/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
@@ -1030,7 +1030,8 @@ void InlineTextBoxPainter::paintDecorations(
: m_inlineTextBox.truncation(),
ltr == flowIsLTR ? m_inlineTextBox.truncation()
: m_inlineTextBox.len() - m_inlineTextBox.truncation(),
- m_inlineTextBox.textPos(), flowIsLTR ? LTR : RTL,
+ m_inlineTextBox.textPos(),
+ flowIsLTR ? TextDirection::Ltr : TextDirection::Rtl,
m_inlineTextBox.isFirstLineStyle()));
if (!flowIsLTR)
localOrigin.move(m_inlineTextBox.logicalWidth() - width, LayoutUnit());
@@ -1141,7 +1142,8 @@ void InlineTextBoxPainter::paintCompositionUnderline(
: m_inlineTextBox.getLineLayoutItem().width(
m_inlineTextBox.start(), paintStart - m_inlineTextBox.start(),
m_inlineTextBox.textPos(),
- m_inlineTextBox.isLeftToRightDirection() ? LTR : RTL,
+ m_inlineTextBox.isLeftToRightDirection() ? TextDirection::Ltr
+ : TextDirection::Rtl,
m_inlineTextBox.isFirstLineStyle());
// how much line to draw
float width;
@@ -1159,7 +1161,8 @@ void InlineTextBoxPainter::paintCompositionUnderline(
: m_inlineTextBox.start() + m_inlineTextBox.len() - paintEnd;
width = m_inlineTextBox.getLineLayoutItem().width(
paintFrom, paintLength, LayoutUnit(m_inlineTextBox.textPos() + start),
- flowIsLTR ? LTR : RTL, m_inlineTextBox.isFirstLineStyle());
+ flowIsLTR ? TextDirection::Ltr : TextDirection::Rtl,
+ m_inlineTextBox.isFirstLineStyle());
}
// In RTL mode, start and width are computed from the right end of the text
// box: starting at |logicalWidth| - |start| and continuing left by |width| to

Powered by Google App Engine
This is Rietveld 408576698