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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp

Issue 2146603007: [css-flexbox] freezeInflexibleItems has to skip out-of-flow boxes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | « third_party/WebKit/LayoutTests/css3/flexbox/max-width-violation.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
index bed1c2fd7b7bfb052fa6b25d5efbcc697265273c..4a7cf2bec4aea4734f609106980cd3781dc085db 100644
--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
@@ -1251,6 +1251,7 @@ bool LayoutFlexibleBox::computeNextFlexLine(OrderedFlexItemList& orderedChildren
void LayoutFlexibleBox::freezeViolations(Vector<FlexItem*>& violations, LayoutUnit& availableFreeSpace, double& totalFlexGrow, double& totalFlexShrink, double& totalWeightedFlexShrink)
{
for (size_t i = 0; i < violations.size(); ++i) {
+ DCHECK(!violations[i]->frozen) << i;
LayoutBox* child = violations[i]->box;
LayoutUnit childSize = violations[i]->flexedContentSize;
availableFreeSpace -= childSize - violations[i]->innerFlexBaseSize;
@@ -1273,6 +1274,9 @@ void LayoutFlexibleBox::freezeInflexibleItems(FlexSign flexSign, OrderedFlexItem
for (size_t i = 0; i < children.size(); ++i) {
FlexItem& flexItem = children[i];
LayoutBox* child = flexItem.box;
+ if (child->isOutOfFlowPositioned())
+ continue;
+ DCHECK(!flexItem.frozen) << i;
float flexFactor = (flexSign == PositiveFlexibility) ? child->style()->flexGrow() : child->style()->flexShrink();
if (flexFactor == 0
|| (flexSign == PositiveFlexibility && flexItem.innerFlexBaseSize > flexItem.hypotheticalMainSize)
@@ -1302,12 +1306,12 @@ bool LayoutFlexibleBox::resolveFlexibleLengths(FlexSign flexSign, OrderedFlexIte
for (size_t i = 0; i < children.size(); ++i) {
FlexItem& flexItem = children[i];
LayoutBox* child = flexItem.box;
- if (child->isOutOfFlowPositioned()) {
+ if (child->isOutOfFlowPositioned())
continue;
- }
if (flexItem.frozen)
continue;
+
LayoutUnit childSize = flexItem.innerFlexBaseSize;
double extraSpace = 0;
if (remainingFreeSpace > 0 && totalFlexGrow > 0 && flexSign == PositiveFlexibility && std::isfinite(totalFlexGrow)) {
« no previous file with comments | « third_party/WebKit/LayoutTests/css3/flexbox/max-width-violation.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698