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

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

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/RenderFlexibleBox.cpp ('k') | sky/engine/core/rendering/RenderReplaced.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderInline.cpp
diff --git a/sky/engine/core/rendering/RenderInline.cpp b/sky/engine/core/rendering/RenderInline.cpp
index 683f243eddab531ebbf733bf92cf50bc7c8e27de..f3be9887ddd58dcce0f37558bde2804e547753b0 100644
--- a/sky/engine/core/rendering/RenderInline.cpp
+++ b/sky/engine/core/rendering/RenderInline.cpp
@@ -1301,15 +1301,15 @@ LayoutSize RenderInline::offsetForInFlowPositionedInline(const RenderBox& child)
// with a static position should locate itself as though it is a normal flow box in relation to
// its containing block. If this relative-positioned inline has a negative offset we need to
// compensate for it so that we align the positioned object with the edge of its containing block.
- if (child.style()->hasStaticInlinePosition(style()->isHorizontalWritingMode()))
+ if (child.style()->hasStaticInlinePosition())
logicalOffset.setWidth(std::max(LayoutUnit(), -offsetForInFlowPosition().width()));
else
logicalOffset.setWidth(inlinePosition);
- if (!child.style()->hasStaticBlockPosition(style()->isHorizontalWritingMode()))
+ if (!child.style()->hasStaticBlockPosition())
logicalOffset.setHeight(blockPosition);
- return style()->isHorizontalWritingMode() ? logicalOffset : logicalOffset.transposedSize();
+ return logicalOffset;
}
void RenderInline::imageChanged(WrappedImagePtr, const IntRect*)
« no previous file with comments | « sky/engine/core/rendering/RenderFlexibleBox.cpp ('k') | sky/engine/core/rendering/RenderReplaced.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698