Index: third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp b/third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp |
index 7b8c16b0e2bc488b452652045672baa696817db8..4de7a6f48340b5b9b094f3fcc64143ea68b9c37a 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp |
@@ -532,7 +532,7 @@ void LayoutDeprecatedFlexibleBox::layoutHorizontalBox(bool relayoutChildren) |
} |
} while (haveFlex); |
- LayoutBlock::finishDelayUpdateScrollInfo(); |
+ LayoutBlock::finishDelayUpdateScrollInfo(0); |
leviw_travelin_and_unemployed
2016/02/25 21:49:51
nullptr
|
if (remainingSpace > 0 && ((style()->isLeftToRightDirection() && style()->boxPack() != Start) |
|| (!style()->isLeftToRightDirection() && style()->boxPack() != End))) { |
@@ -783,7 +783,7 @@ void LayoutDeprecatedFlexibleBox::layoutVerticalBox(bool relayoutChildren) |
} |
} while (haveFlex); |
- LayoutBlock::finishDelayUpdateScrollInfo(); |
+ LayoutBlock::finishDelayUpdateScrollInfo(0); |
leviw_travelin_and_unemployed
2016/02/25 21:49:51
ditto
|
if (style()->boxPack() != Start && remainingSpace > 0) { |
// Children must be repositioned. |