- Revision
- 276718
- Author
- [email protected]
- Date
- 2021-04-28 09:54:01 -0700 (Wed, 28 Apr 2021)
Log Message
Remove redundant RenderObject::isInFlowRenderFragmentedFlow
https://bugs.webkit.org/show_bug.cgi?id=225152
Reviewed by Antti Koivisto.
Now that RenderObject::isOutOfFlowRenderFragmentedFlow() is gone (r276707), isInFlowRenderFragmentedFlow() is really just a isRenderFragmentedFlow() check.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::selectionGaps):
(WebCore::isChildHitTestCandidate):
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::updateStylesForColumnChildren):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::skipContainingBlockForPercentHeightCalculation const):
* rendering/RenderBox.h:
(WebCore::RenderBox::canHaveOutsideFragmentRange const):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::shouldBeNormalFlowOnly const):
(WebCore::RenderLayer::updateLayerPositions):
(WebCore::RenderLayer::updatePagination):
(WebCore::RenderLayer::calculateClipRects const):
* rendering/RenderObject.h:
(WebCore::RenderObject::isRenderGrid const):
(WebCore::RenderObject::isInFlowRenderFragmentedFlow const): Deleted.
* rendering/updating/RenderTreeBuilderMultiColumn.cpp:
(WebCore::RenderTreeBuilder::MultiColumn::multiColumnDescendantInserted):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (276717 => 276718)
--- trunk/Source/WebCore/ChangeLog 2021-04-28 16:29:11 UTC (rev 276717)
+++ trunk/Source/WebCore/ChangeLog 2021-04-28 16:54:01 UTC (rev 276718)
@@ -1,3 +1,32 @@
+2021-04-28 Zalan Bujtas <[email protected]>
+
+ Remove redundant RenderObject::isInFlowRenderFragmentedFlow
+ https://bugs.webkit.org/show_bug.cgi?id=225152
+
+ Reviewed by Antti Koivisto.
+
+ Now that RenderObject::isOutOfFlowRenderFragmentedFlow() is gone (r276707), isInFlowRenderFragmentedFlow() is really just a isRenderFragmentedFlow() check.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::selectionGaps):
+ (WebCore::isChildHitTestCandidate):
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::updateStylesForColumnChildren):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::skipContainingBlockForPercentHeightCalculation const):
+ * rendering/RenderBox.h:
+ (WebCore::RenderBox::canHaveOutsideFragmentRange const):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::shouldBeNormalFlowOnly const):
+ (WebCore::RenderLayer::updateLayerPositions):
+ (WebCore::RenderLayer::updatePagination):
+ (WebCore::RenderLayer::calculateClipRects const):
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::isRenderGrid const):
+ (WebCore::RenderObject::isInFlowRenderFragmentedFlow const): Deleted.
+ * rendering/updating/RenderTreeBuilderMultiColumn.cpp:
+ (WebCore::RenderTreeBuilder::MultiColumn::multiColumnDescendantInserted):
+
2021-04-28 Youenn Fablet <[email protected]>
Set audio transceiver nMax to 1
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (276717 => 276718)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2021-04-28 16:29:11 UTC (rev 276717)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2021-04-28 16:54:01 UTC (rev 276718)
@@ -1573,7 +1573,7 @@
if (!isRenderBlockFlow()) // FIXME: Make multi-column selection gap filling work someday.
return result;
- if (hasTransform() || style().columnSpan() == ColumnSpan::All || isInFlowRenderFragmentedFlow()) {
+ if (hasTransform() || style().columnSpan() == ColumnSpan::All || isRenderFragmentedFlow()) {
// FIXME: We should learn how to gap fill multiple columns and transforms eventually.
lastLogicalTop = blockDirectionOffset(rootBlock, offsetFromRootBlock) + logicalHeight();
lastLogicalLeft = logicalLeftSelectionOffset(rootBlock, logicalHeight(), cache);
@@ -2202,7 +2202,7 @@
static inline bool isChildHitTestCandidate(const RenderBox& box)
{
- return box.height() && box.style().visibility() == Visibility::Visible && !box.isOutOfFlowPositioned() && !box.isInFlowRenderFragmentedFlow();
+ return box.height() && box.style().visibility() == Visibility::Visible && !box.isOutOfFlowPositioned() && !box.isRenderFragmentedFlow();
}
// Valid candidates in a FragmentedFlow must be rendered by the fragment.
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (276717 => 276718)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2021-04-28 16:29:11 UTC (rev 276717)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2021-04-28 16:54:01 UTC (rev 276718)
@@ -2131,7 +2131,7 @@
void RenderBlockFlow::updateStylesForColumnChildren()
{
- for (auto* child = firstChildBox(); child && (child->isInFlowRenderFragmentedFlow() || child->isRenderMultiColumnSet()); child = child->nextSiblingBox())
+ for (auto* child = firstChildBox(); child && (child->isRenderFragmentedFlow() || child->isRenderMultiColumnSet()); child = child->nextSiblingBox())
child->setStyle(RenderStyle::createAnonymousStyleWithDisplay(style(), DisplayType::Block));
}
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (276717 => 276718)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2021-04-28 16:29:11 UTC (rev 276717)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2021-04-28 16:54:01 UTC (rev 276718)
@@ -3040,7 +3040,7 @@
{
// Flow threads for multicol or paged overflow should be skipped. They are invisible to the DOM,
// and percent heights of children should be resolved against the multicol or paged container.
- if (containingBlock.isInFlowRenderFragmentedFlow() && !isPerpendicularWritingMode)
+ if (containingBlock.isRenderFragmentedFlow() && !isPerpendicularWritingMode)
return true;
// Render view is not considered auto height.
Modified: trunk/Source/WebCore/rendering/RenderBox.h (276717 => 276718)
--- trunk/Source/WebCore/rendering/RenderBox.h 2021-04-28 16:29:11 UTC (rev 276717)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2021-04-28 16:54:01 UTC (rev 276718)
@@ -641,7 +641,7 @@
}
// True if this box can have a range in an outside fragmentation context.
- bool canHaveOutsideFragmentRange() const { return !isInFlowRenderFragmentedFlow(); }
+ bool canHaveOutsideFragmentRange() const { return !isRenderFragmentedFlow(); }
virtual bool needsLayoutAfterFragmentRangeChange() const { return false; }
bool isGridItem() const { return parent() && parent()->isRenderGrid() && !isExcludedFromNormalLayout(); }
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (276717 => 276718)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2021-04-28 16:29:11 UTC (rev 276717)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2021-04-28 16:54:01 UTC (rev 276718)
@@ -577,7 +577,7 @@
|| renderer().isEmbeddedObject()
|| renderer().isRenderIFrame()
|| (renderer().style().specifiesColumns() && !isRenderViewLayer())
- || renderer().isInFlowRenderFragmentedFlow();
+ || renderer().isRenderFragmentedFlow();
}
bool RenderLayer::shouldBeCSSStackingContext() const
@@ -984,7 +984,7 @@
if (m_reflection)
m_reflection->layout();
- if (renderer().isInFlowRenderFragmentedFlow()) {
+ if (renderer().isRenderFragmentedFlow()) {
updatePagination();
flags.add(UpdatePagination);
}
@@ -1388,7 +1388,7 @@
// genuinely know if it is going to have to split itself up when painting only its contents (and not any other descendant
// layers). We track an enclosingPaginationLayer instead of using a simple bit, since we want to be able to get back
// to that layer easily.
- if (renderer().isInFlowRenderFragmentedFlow()) {
+ if (renderer().isRenderFragmentedFlow()) {
m_enclosingPaginationLayer = makeWeakPtr(*this);
return;
}
@@ -5131,7 +5131,7 @@
|| renderer().isVideo()
|| renderer().isEmbeddedObject()
|| renderer().isRenderIFrame()
- || renderer().isInFlowRenderFragmentedFlow();
+ || renderer().isRenderFragmentedFlow();
}
void RenderLayer::updateSelfPaintingLayer()
Modified: trunk/Source/WebCore/rendering/RenderObject.h (276717 => 276718)
--- trunk/Source/WebCore/rendering/RenderObject.h 2021-04-28 16:29:11 UTC (rev 276717)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2021-04-28 16:54:01 UTC (rev 276718)
@@ -261,7 +261,6 @@
virtual bool isRenderFullScreenPlaceholder() const { return false; }
#endif
virtual bool isRenderGrid() const { return false; }
- bool isInFlowRenderFragmentedFlow() const { return isRenderFragmentedFlow() && !isOutOfFlowPositioned(); }
virtual bool isMultiColumnBlockFlow() const { return false; }
virtual bool isRenderMultiColumnSet() const { return false; }
Modified: trunk/Source/WebCore/rendering/updating/RenderTreeBuilderMultiColumn.cpp (276717 => 276718)
--- trunk/Source/WebCore/rendering/updating/RenderTreeBuilderMultiColumn.cpp 2021-04-28 16:29:11 UTC (rev 276717)
+++ trunk/Source/WebCore/rendering/updating/RenderTreeBuilderMultiColumn.cpp 2021-04-28 16:54:01 UTC (rev 276718)
@@ -278,7 +278,7 @@
void RenderTreeBuilder::MultiColumn::multiColumnDescendantInserted(RenderMultiColumnFlow& flow, RenderObject& newDescendant)
{
- if (gShiftingSpanner || newDescendant.isInFlowRenderFragmentedFlow())
+ if (gShiftingSpanner || newDescendant.isRenderFragmentedFlow())
return;
auto* subtreeRoot = &newDescendant;
