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

Unified Diff: sky/engine/core/rendering/InlineFlowBox.h

Issue 688213002: First pass at removing dead vertical writing mode code. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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.cpp ('k') | sky/engine/core/rendering/InlineFlowBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/InlineFlowBox.h
diff --git a/sky/engine/core/rendering/InlineFlowBox.h b/sky/engine/core/rendering/InlineFlowBox.h
index a5baaed62dc37b7f6d375c9d7d5feb77574f71ae..e27b0499350ab9a355717eac2ee60273818be8c0 100644
--- a/sky/engine/core/rendering/InlineFlowBox.h
+++ b/sky/engine/core/rendering/InlineFlowBox.h
@@ -223,32 +223,28 @@ public:
}
LayoutUnit logicalLeftLayoutOverflow() const
{
- return m_overflow ? (isHorizontal() ? m_overflow->layoutOverflowRect().x() : m_overflow->layoutOverflowRect().y()) :
- static_cast<LayoutUnit>(logicalLeft());
+ return m_overflow ? m_overflow->layoutOverflowRect().x() : static_cast<LayoutUnit>(logicalLeft());
}
LayoutUnit logicalRightLayoutOverflow() const
{
- return m_overflow ? (isHorizontal() ? m_overflow->layoutOverflowRect().maxX() : m_overflow->layoutOverflowRect().maxY()) :
- static_cast<LayoutUnit>(ceilf(logicalRight()));
+ return m_overflow ? m_overflow->layoutOverflowRect().maxX() : static_cast<LayoutUnit>(ceilf(logicalRight()));
}
LayoutUnit logicalTopLayoutOverflow(LayoutUnit lineTop) const
{
if (m_overflow)
- return isHorizontal() ? m_overflow->layoutOverflowRect().y() : m_overflow->layoutOverflowRect().x();
+ return m_overflow->layoutOverflowRect().y();
return lineTop;
}
LayoutUnit logicalBottomLayoutOverflow(LayoutUnit lineBottom) const
{
if (m_overflow)
- return isHorizontal() ? m_overflow->layoutOverflowRect().maxY() : m_overflow->layoutOverflowRect().maxX();
+ return m_overflow->layoutOverflowRect().maxY();
return lineBottom;
}
LayoutRect logicalLayoutOverflowRect(LayoutUnit lineTop, LayoutUnit lineBottom) const
{
- LayoutRect result = layoutOverflowRect(lineTop, lineBottom);
- if (!renderer().isHorizontalWritingMode())
- result = result.transposedRect();
- return result;
+ // FIXME(sky): Remove
+ return layoutOverflowRect(lineTop, lineBottom);
}
LayoutRect visualOverflowRect(LayoutUnit lineTop, LayoutUnit lineBottom) const
@@ -271,19 +267,14 @@ public:
}
LayoutRect logicalVisualOverflowRect(LayoutUnit lineTop, LayoutUnit lineBottom) const
{
- LayoutRect result = visualOverflowRect(lineTop, lineBottom);
- if (!renderer().isHorizontalWritingMode())
- result = result.transposedRect();
- return result;
+ return visualOverflowRect(lineTop, lineBottom);
}
void setOverflowFromLogicalRects(const LayoutRect& logicalLayoutOverflow, const LayoutRect& logicalVisualOverflow, LayoutUnit lineTop, LayoutUnit lineBottom);
FloatRect frameRectIncludingLineHeight(LayoutUnit lineTop, LayoutUnit lineBottom) const
{
- if (isHorizontal())
- return FloatRect(m_topLeft.x(), lineTop.toFloat(), width(), (lineBottom - lineTop).toFloat());
- return FloatRect(lineTop.toFloat(), m_topLeft.y(), (lineBottom - lineTop).toFloat(), height());
+ return FloatRect(m_topLeft.x(), lineTop.toFloat(), width(), (lineBottom - lineTop).toFloat());
}
FloatRect logicalFrameRectIncludingLineHeight(LayoutUnit lineTop, LayoutUnit lineBottom) const
« no previous file with comments | « sky/engine/core/rendering/InlineBox.cpp ('k') | sky/engine/core/rendering/InlineFlowBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698