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

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

Issue 1055263002: Make custom layout actually work. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 9 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/dom/Element.idl ('k') | sky/engine/core/rendering/RenderCustomLayout.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderBox.cpp
diff --git a/sky/engine/core/rendering/RenderBox.cpp b/sky/engine/core/rendering/RenderBox.cpp
index c986599473bb56798dfbda9d6f1f6b0e7837d897..829bae3679066fc0000a688f9a9ea31e0b8efe95 100644
--- a/sky/engine/core/rendering/RenderBox.cpp
+++ b/sky/engine/core/rendering/RenderBox.cpp
@@ -1289,11 +1289,7 @@ void RenderBox::computeLogicalWidth(LogicalExtentComputedValues& computedValues)
if (node() && view()->frameView() && view()->frameView()->layoutRoot(true) == this)
return;
- // The parent box is flexing us, so it has increased or decreased our
- // width. Use the width from the style context.
- // FIXME: Account for block-flow in flexible boxes.
- // https://bugs.webkit.org/show_bug.cgi?id=46418
- if (hasOverrideWidth() && parent()->isFlexibleBox()) {
+ if (hasOverrideWidth()) {
computedValues.m_extent = overrideLogicalContentWidth() + borderAndPaddingLogicalWidth();
return;
}
« no previous file with comments | « sky/engine/core/dom/Element.idl ('k') | sky/engine/core/rendering/RenderCustomLayout.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698