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

Unified Diff: sky/engine/core/rendering/shapes/ShapeOutsideInfo.cpp

Issue 674073005: Remove final instances of WritingMode in Sky. (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/RenderObject.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/shapes/ShapeOutsideInfo.cpp
diff --git a/sky/engine/core/rendering/shapes/ShapeOutsideInfo.cpp b/sky/engine/core/rendering/shapes/ShapeOutsideInfo.cpp
index 558dd767e89ef20ff31f60aa5542aed8d8fa1dc9..fcb7289a02f926430d9b60ab19d8bd742a17c176 100644
--- a/sky/engine/core/rendering/shapes/ShapeOutsideInfo.cpp
+++ b/sky/engine/core/rendering/shapes/ShapeOutsideInfo.cpp
@@ -143,25 +143,13 @@ const Shape& ShapeOutsideInfo::computedShape() const
return *m_shape;
}
-inline LayoutUnit borderBeforeInWritingMode(const RenderBox& renderer)
-{
- // FIXME(sky): Remove
- return renderer.borderBefore();
-}
-
-inline LayoutUnit borderAndPaddingBeforeInWritingMode(const RenderBox& renderer)
-{
- // FIXME(sky): Remove
- return renderer.borderAndPaddingBefore();
-}
-
LayoutUnit ShapeOutsideInfo::logicalTopOffset() const
{
switch (referenceBox(*m_renderer.style()->shapeOutside())) {
case MarginBox: return -m_renderer.marginBefore(m_renderer.containingBlock()->style());
case BorderBox: return LayoutUnit();
- case PaddingBox: return borderBeforeInWritingMode(m_renderer);
- case ContentBox: return borderAndPaddingBeforeInWritingMode(m_renderer);
+ case PaddingBox: return m_renderer.borderBefore();
+ case ContentBox: return m_renderer.borderAndPaddingBefore();
case BoxMissing: break;
}
@@ -169,14 +157,14 @@ LayoutUnit ShapeOutsideInfo::logicalTopOffset() const
return LayoutUnit();
}
-inline LayoutUnit borderStartWithStyleForWritingMode(const RenderBox& renderer, const RenderStyle* style)
+inline LayoutUnit borderStartWithStyle(const RenderBox& renderer, const RenderStyle* style)
{
if (style->isLeftToRightDirection())
return renderer.borderLeft();
return renderer.borderRight();
}
-inline LayoutUnit borderAndPaddingStartWithStyleForWritingMode(const RenderBox& renderer, const RenderStyle* style)
+inline LayoutUnit borderAndPaddingStartWithStyle(const RenderBox& renderer, const RenderStyle* style)
{
if (style->isLeftToRightDirection())
return renderer.borderLeft() + renderer.paddingLeft();
@@ -189,8 +177,8 @@ LayoutUnit ShapeOutsideInfo::logicalLeftOffset() const
switch (referenceBox(*m_renderer.style()->shapeOutside())) {
case MarginBox: return -m_renderer.marginStart(m_renderer.containingBlock()->style());
case BorderBox: return LayoutUnit();
- case PaddingBox: return borderStartWithStyleForWritingMode(m_renderer, m_renderer.containingBlock()->style());
- case ContentBox: return borderAndPaddingStartWithStyleForWritingMode(m_renderer, m_renderer.containingBlock()->style());
+ case PaddingBox: return borderStartWithStyle(m_renderer, m_renderer.containingBlock()->style());
+ case ContentBox: return borderAndPaddingStartWithStyle(m_renderer, m_renderer.containingBlock()->style());
case BoxMissing: break;
}
« no previous file with comments | « sky/engine/core/rendering/RenderObject.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698