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

Unified Diff: third_party/WebKit/Source/core/layout/line/AbstractInlineTextBox.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/layout/line/AbstractInlineTextBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/line/AbstractInlineTextBox.cpp b/third_party/WebKit/Source/core/layout/line/AbstractInlineTextBox.cpp
index cc758ad52000d8d58c74399e5a95cf0cbf68a56e..0f681b53006462502eff7611554725399405bb9e 100644
--- a/third_party/WebKit/Source/core/layout/line/AbstractInlineTextBox.cpp
+++ b/third_party/WebKit/Source/core/layout/line/AbstractInlineTextBox.cpp
@@ -114,9 +114,12 @@ AbstractInlineTextBox::Direction AbstractInlineTextBox::getDirection() const {
if (!m_inlineTextBox || !m_lineLayoutItem)
return LeftToRight;
- if (m_lineLayoutItem.style()->isHorizontalWritingMode())
- return (m_inlineTextBox->direction() == RTL ? RightToLeft : LeftToRight);
- return (m_inlineTextBox->direction() == RTL ? BottomToTop : TopToBottom);
+ if (m_lineLayoutItem.style()->isHorizontalWritingMode()) {
+ return (m_inlineTextBox->direction() == TextDirection::Rtl ? RightToLeft
+ : LeftToRight);
+ }
+ return (m_inlineTextBox->direction() == TextDirection::Rtl ? BottomToTop
+ : TopToBottom);
}
void AbstractInlineTextBox::characterWidths(Vector<float>& widths) const {

Powered by Google App Engine
This is Rietveld 408576698