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

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

Issue 683803006: Remove all writing mode function arguments and remove writing mode from RenderStyle. (Closed) Base URL: git@github.com:domokit/mojo.git@writingmode
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/InlineFlowBox.cpp ('k') | sky/engine/core/rendering/RenderGrid.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderBox.h
diff --git a/sky/engine/core/rendering/RenderBox.h b/sky/engine/core/rendering/RenderBox.h
index abda608d8b245951a3f9728f7e4d3367e3b62af6..bc03d6e9271a9fc452bce408409f736d65147c26 100644
--- a/sky/engine/core/rendering/RenderBox.h
+++ b/sky/engine/core/rendering/RenderBox.h
@@ -293,32 +293,32 @@ public:
void setMarginLeft(LayoutUnit margin) { m_marginBox.setLeft(margin); }
void setMarginRight(LayoutUnit margin) { m_marginBox.setRight(margin); }
- LayoutUnit marginLogicalLeft() const { return m_marginBox.logicalLeft(style()->writingMode()); }
- LayoutUnit marginLogicalRight() const { return m_marginBox.logicalRight(style()->writingMode()); }
+ LayoutUnit marginLogicalLeft() const { return m_marginBox.logicalLeft(); }
+ LayoutUnit marginLogicalRight() const { return m_marginBox.logicalRight(); }
- virtual LayoutUnit marginBefore(const RenderStyle* overrideStyle = 0) const override final { return m_marginBox.before((overrideStyle ? overrideStyle : style())->writingMode()); }
- virtual LayoutUnit marginAfter(const RenderStyle* overrideStyle = 0) const override final { return m_marginBox.after((overrideStyle ? overrideStyle : style())->writingMode()); }
+ virtual LayoutUnit marginBefore(const RenderStyle* overrideStyle = 0) const override final { return m_marginBox.before(); }
+ virtual LayoutUnit marginAfter(const RenderStyle* overrideStyle = 0) const override final { return m_marginBox.after(); }
virtual LayoutUnit marginStart(const RenderStyle* overrideStyle = 0) const override final
{
const RenderStyle* styleToUse = overrideStyle ? overrideStyle : style();
- return m_marginBox.start(styleToUse->writingMode(), styleToUse->direction());
+ return m_marginBox.start(styleToUse->direction());
}
virtual LayoutUnit marginEnd(const RenderStyle* overrideStyle = 0) const override final
{
const RenderStyle* styleToUse = overrideStyle ? overrideStyle : style();
- return m_marginBox.end(styleToUse->writingMode(), styleToUse->direction());
+ return m_marginBox.end(styleToUse->direction());
}
- void setMarginBefore(LayoutUnit value, const RenderStyle* overrideStyle = 0) { m_marginBox.setBefore((overrideStyle ? overrideStyle : style())->writingMode(), value); }
- void setMarginAfter(LayoutUnit value, const RenderStyle* overrideStyle = 0) { m_marginBox.setAfter((overrideStyle ? overrideStyle : style())->writingMode(), value); }
+ void setMarginBefore(LayoutUnit value, const RenderStyle* overrideStyle = 0) { m_marginBox.setBefore(value); }
+ void setMarginAfter(LayoutUnit value, const RenderStyle* overrideStyle = 0) { m_marginBox.setAfter(value); }
void setMarginStart(LayoutUnit value, const RenderStyle* overrideStyle = 0)
{
const RenderStyle* styleToUse = overrideStyle ? overrideStyle : style();
- m_marginBox.setStart(styleToUse->writingMode(), styleToUse->direction(), value);
+ m_marginBox.setStart(styleToUse->direction(), value);
}
void setMarginEnd(LayoutUnit value, const RenderStyle* overrideStyle = 0)
{
const RenderStyle* styleToUse = overrideStyle ? overrideStyle : style();
- m_marginBox.setEnd(styleToUse->writingMode(), styleToUse->direction(), value);
+ m_marginBox.setEnd(styleToUse->direction(), value);
}
// The following five functions are used to implement collapsing margins.
@@ -527,7 +527,7 @@ public:
bool shrinkToAvoidFloats() const;
virtual bool avoidsFloats() const;
- bool isWritingModeRoot() const { return !parent() || parent()->style()->writingMode() != style()->writingMode(); }
+ bool isWritingModeRoot() const { return false; }
bool isFlexItemIncludingDeprecated() const { return !isInline() && !isFloatingOrOutOfFlowPositioned() && parent() && parent()->isFlexibleBox(); }
« no previous file with comments | « sky/engine/core/rendering/InlineFlowBox.cpp ('k') | sky/engine/core/rendering/RenderGrid.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698