| 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 f9161a4e14764de2d577489fa4c29e09b47e2489..ab56f2621aa36c3438e3d5b232ce78e7bf420ebe 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
|
| @@ -30,6 +30,7 @@
|
|
|
| #include "core/layout/LayoutFlexibleBox.h"
|
|
|
| +#include <limits>
|
| #include "core/frame/UseCounter.h"
|
| #include "core/layout/FlexibleBoxAlgorithm.h"
|
| #include "core/layout/LayoutState.h"
|
| @@ -41,7 +42,6 @@
|
| #include "platform/LengthFunctions.h"
|
| #include "wtf/AutoReset.h"
|
| #include "wtf/MathExtras.h"
|
| -#include <limits>
|
|
|
| namespace blink {
|
|
|
| @@ -941,7 +941,6 @@ void LayoutFlexibleBox::layoutFlexItems(bool relayoutChildren,
|
| PaintLayerScrollableArea::PreventRelayoutScope preventRelayoutScope(
|
| layoutScope);
|
|
|
| -
|
| // Set up our master list of flex items. All of the rest of the algorithm
|
| // should work off this list of a subset.
|
| // TODO(cbiesinger): That second part is not yet true.
|
| @@ -950,7 +949,6 @@ void LayoutFlexibleBox::layoutFlexItems(bool relayoutChildren,
|
| m_orderIterator.first();
|
| for (LayoutBox* child = m_orderIterator.currentChild(); child;
|
| child = m_orderIterator.next()) {
|
| -
|
| if (child->isOutOfFlowPositioned()) {
|
| // Out-of-flow children are not flex items, so we skip them here.
|
| prepareChildForPositionedLayout(*child);
|
|
|