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

Unified Diff: sky/engine/core/rendering/InlineBox.cpp

Issue 688233002: Remove writing mode code from the linebox tree. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: merge to ToT Created 6 years, 2 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
« no previous file with comments | « sky/engine/core/rendering/InlineBox.h ('k') | sky/engine/core/rendering/InlineFlowBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/InlineBox.cpp
diff --git a/sky/engine/core/rendering/InlineBox.cpp b/sky/engine/core/rendering/InlineBox.cpp
index 4a3cda724460ee39ef53e66f51e875071256d1ac..1f794c9dab53492630ae4937056dd3845baadca0 100644
--- a/sky/engine/core/rendering/InlineBox.cpp
+++ b/sky/engine/core/rendering/InlineBox.cpp
@@ -124,7 +124,7 @@ float InlineBox::logicalHeight() const
if (renderer().isText())
return m_bitfields.isText() ? renderer().style(isFirstLineStyle())->fontMetrics().height() : 0;
if (renderer().isBox() && parent())
- return isHorizontal() ? toRenderBox(renderer()).height().toFloat() : toRenderBox(renderer()).width().toFloat();
+ return toRenderBox(renderer()).height().toFloat();
ASSERT(isInlineFlowBox());
RenderBoxModelObject* flowObject = boxModelObject();
@@ -137,12 +137,12 @@ float InlineBox::logicalHeight() const
int InlineBox::baselinePosition(FontBaseline baselineType) const
{
- return boxModelObject()->baselinePosition(baselineType, m_bitfields.firstLine(), isHorizontal() ? HorizontalLine : VerticalLine, PositionOnContainingLine);
+ return boxModelObject()->baselinePosition(baselineType, m_bitfields.firstLine(), HorizontalLine, PositionOnContainingLine);
}
LayoutUnit InlineBox::lineHeight() const
{
- return boxModelObject()->lineHeight(m_bitfields.firstLine(), isHorizontal() ? HorizontalLine : VerticalLine, PositionOnContainingLine);
+ return boxModelObject()->lineHeight(m_bitfields.firstLine(), HorizontalLine, PositionOnContainingLine);
}
int InlineBox::caretMinOffset() const
« no previous file with comments | « sky/engine/core/rendering/InlineBox.h ('k') | sky/engine/core/rendering/InlineFlowBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698