| Index: Source/core/layout/LayoutBlock.cpp
|
| diff --git a/Source/core/layout/LayoutBlock.cpp b/Source/core/layout/LayoutBlock.cpp
|
| index d018a295c85d0236b4d8a764cdaecee4db81a6f9..bd6affa7f056dcb0a84027673c5c12b5490e7637 100644
|
| --- a/Source/core/layout/LayoutBlock.cpp
|
| +++ b/Source/core/layout/LayoutBlock.cpp
|
| @@ -66,7 +66,6 @@
|
| #include "core/paint/BoxPainter.h"
|
| #include "core/paint/DeprecatedPaintLayer.h"
|
| #include "core/paint/LayoutObjectDrawingRecorder.h"
|
| -#include "platform/RuntimeEnabledFeatures.h"
|
| #include "platform/geometry/FloatQuad.h"
|
| #include "platform/geometry/TransformState.h"
|
| #include "wtf/StdLibExtras.h"
|
| @@ -850,7 +849,7 @@ void LayoutBlock::addChildIgnoringAnonymousColumnBlocks(LayoutObject* newChild,
|
| }
|
|
|
| // Check for a spanning element in columns.
|
| - if (gColumnFlowSplitEnabled && !RuntimeEnabledFeatures::regionBasedColumnsEnabled()) {
|
| + if (gColumnFlowSplitEnabled && !document().regionBasedColumnsEnabled()) {
|
| LayoutBlockFlow* columnsBlockAncestor = columnsBlockForSpanningElement(newChild);
|
| if (columnsBlockAncestor) {
|
| TemporaryChange<bool> columnFlowSplitEnabled(gColumnFlowSplitEnabled, false);
|
| @@ -1533,7 +1532,7 @@ bool LayoutBlock::createsNewFormattingContext() const
|
| {
|
| return isInlineBlockOrInlineTable() || isFloatingOrOutOfFlowPositioned() || hasOverflowClip() || isFlexItemIncludingDeprecated()
|
| || style()->specifiesColumns() || isLayoutFlowThread() || isTableCell() || isTableCaption() || isFieldset() || isWritingModeRoot()
|
| - || isDocumentElement() || (RuntimeEnabledFeatures::regionBasedColumnsEnabled() ? isColumnSpanAll() : style()->columnSpan()) || isGridItem();
|
| + || isDocumentElement() || (document().regionBasedColumnsEnabled() ? isColumnSpanAll() : style()->columnSpan()) || isGridItem();
|
| }
|
|
|
| void LayoutBlock::updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, LayoutBox& child)
|
| @@ -2613,7 +2612,7 @@ int LayoutBlock::columnGap() const
|
|
|
| void LayoutBlock::calcColumnWidth()
|
| {
|
| - if (RuntimeEnabledFeatures::regionBasedColumnsEnabled())
|
| + if (document().regionBasedColumnsEnabled())
|
| return;
|
|
|
| // Calculate our column width and column count.
|
| @@ -2960,7 +2959,7 @@ void LayoutBlock::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Lay
|
| // The flow thread based multicol implementation will do this adjustment on the flow thread, and
|
| // not here on the multicol container, so that spanners won't incorrectly be treated as column
|
| // content (and have spanners' preferred widths multiplied by the number of columns, etc.).
|
| - if (style()->specifiesColumns() && !RuntimeEnabledFeatures::regionBasedColumnsEnabled())
|
| + if (style()->specifiesColumns() && !document().regionBasedColumnsEnabled())
|
| adjustIntrinsicLogicalWidthsForColumns(minLogicalWidth, maxLogicalWidth);
|
|
|
| if (isTableCell()) {
|
| @@ -3015,7 +3014,7 @@ void LayoutBlock::computePreferredLogicalWidths()
|
|
|
| void LayoutBlock::adjustIntrinsicLogicalWidthsForColumns(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const
|
| {
|
| - ASSERT(!RuntimeEnabledFeatures::regionBasedColumnsEnabled());
|
| + ASSERT(!document().regionBasedColumnsEnabled());
|
| if (!style()->hasAutoColumnCount() || !style()->hasAutoColumnWidth()) {
|
| // The min/max intrinsic widths calculated really tell how much space elements need when
|
| // laid out inside the columns. In order to eventually end up with the desired column width,
|
|
|