Title: [236611] trunk/Source/WebCore
- Revision
- 236611
- Author
- [email protected]
- Date
- 2018-09-28 14:03:23 -0700 (Fri, 28 Sep 2018)
Log Message
Remove some unused RenderLayer code
https://bugs.webkit.org/show_bug.cgi?id=190078
Reviewed by Zalan Bujtas.
The 'outOfFlowDescendantContainingBlocks' code was related to the accelerated overflow scrolling code that
I removed recently.
updateDescendantsLayerListsIfNeeded() is never called.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::updateDescendantDependentFlags):
(WebCore::RenderLayer::calculateClipRects const):
* rendering/RenderLayer.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (236610 => 236611)
--- trunk/Source/WebCore/ChangeLog 2018-09-28 20:38:32 UTC (rev 236610)
+++ trunk/Source/WebCore/ChangeLog 2018-09-28 21:03:23 UTC (rev 236611)
@@ -1,3 +1,20 @@
+2018-09-28 Simon Fraser <[email protected]>
+
+ Remove some unused RenderLayer code
+ https://bugs.webkit.org/show_bug.cgi?id=190078
+
+ Reviewed by Zalan Bujtas.
+
+ The 'outOfFlowDescendantContainingBlocks' code was related to the accelerated overflow scrolling code that
+ I removed recently.
+
+ updateDescendantsLayerListsIfNeeded() is never called.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::updateDescendantDependentFlags):
+ (WebCore::RenderLayer::calculateClipRects const):
+ * rendering/RenderLayer.h:
+
2018-09-28 Commit Queue <[email protected]>
Unreviewed, rolling out r236605.
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (236610 => 236611)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2018-09-28 20:38:32 UTC (rev 236610)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2018-09-28 21:03:23 UTC (rev 236611)
@@ -1004,7 +1004,7 @@
}
}
-void RenderLayer::updateDescendantDependentFlags(HashSet<const RenderObject*>* outOfFlowDescendantContainingBlocks)
+void RenderLayer::updateDescendantDependentFlags()
{
if (m_visibleDescendantStatusDirty || m_hasSelfPaintingLayerDescendantDirty || hasNotIsolatedBlendingDescendantsStatusDirty()) {
bool hasVisibleDescendant = false;
@@ -1013,21 +1013,9 @@
bool hasNotIsolatedBlendingDescendants = false;
#endif
- HashSet<const RenderObject*> childOutOfFlowDescendantContainingBlocks;
for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) {
- childOutOfFlowDescendantContainingBlocks.clear();
- child->updateDescendantDependentFlags(&childOutOfFlowDescendantContainingBlocks);
+ child->updateDescendantDependentFlags();
- bool childIsOutOfFlowPositioned = child->renderer().isOutOfFlowPositioned();
- if (childIsOutOfFlowPositioned)
- childOutOfFlowDescendantContainingBlocks.add(child->renderer().containingBlock());
-
- if (outOfFlowDescendantContainingBlocks) {
- HashSet<const RenderObject*>::const_iterator it = childOutOfFlowDescendantContainingBlocks.begin();
- for (; it != childOutOfFlowDescendantContainingBlocks.end(); ++it)
- outOfFlowDescendantContainingBlocks->add(*it);
- }
-
hasVisibleDescendant |= child->m_hasVisibleContent || child->m_hasVisibleDescendant;
hasSelfPaintingLayerDescendant |= child->isSelfPaintingLayer() || child->hasSelfPaintingLayerDescendant();
#if ENABLE(CSS_COMPOSITING)
@@ -1042,9 +1030,6 @@
break;
}
- if (outOfFlowDescendantContainingBlocks)
- outOfFlowDescendantContainingBlocks->remove(&renderer());
-
m_hasVisibleDescendant = hasVisibleDescendant;
m_visibleDescendantStatusDirty = false;
m_hasSelfPaintingLayerDescendant = hasSelfPaintingLayerDescendant;
@@ -5968,32 +5953,6 @@
}
}
-void RenderLayer::updateDescendantsLayerListsIfNeeded(bool recursive)
-{
- Vector<RenderLayer*> layersToUpdate;
-
- if (auto* list = negZOrderList()) {
- for (auto* childLayer : *list)
- layersToUpdate.append(childLayer);
- }
-
- if (auto* list = normalFlowList()) {
- for (auto* childLayer : *list)
- layersToUpdate.append(childLayer);
- }
-
- if (auto* list = posZOrderList()) {
- for (auto* childLayer : *list)
- layersToUpdate.append(childLayer);
- }
-
- for (auto* childLayer : layersToUpdate) {
- childLayer->updateLayerListsIfNeeded();
- if (recursive)
- childLayer->updateDescendantsLayerListsIfNeeded(true);
- }
-}
-
void RenderLayer::updateCompositingAndLayerListsIfNeeded()
{
if (compositor().inCompositingMode()) {
Modified: trunk/Source/WebCore/rendering/RenderLayer.h (236610 => 236611)
--- trunk/Source/WebCore/rendering/RenderLayer.h 2018-09-28 20:38:32 UTC (rev 236610)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2018-09-28 21:03:23 UTC (rev 236611)
@@ -378,9 +378,6 @@
// Update our normal and z-index lists.
void updateLayerListsIfNeeded();
- // Update the normal and z-index lists of our descendants.
- void updateDescendantsLayerListsIfNeeded(bool recursive);
-
// FIXME: We should ASSERT(!m_visibleContentStatusDirty) here, but see https://bugs.webkit.org/show_bug.cgi?id=71044
// ditto for hasVisibleDescendant(), see https://bugs.webkit.org/show_bug.cgi?id=71277
bool hasVisibleContent() const { return m_hasVisibleContent; }
@@ -913,7 +910,7 @@
void dirtyAncestorChainVisibleDescendantStatus();
void setAncestorChainHasVisibleDescendant();
- void updateDescendantDependentFlags(HashSet<const RenderObject*>* outOfFlowDescendantContainingBlocks = nullptr);
+ void updateDescendantDependentFlags();
bool has3DTransformedDescendant() const { return m_has3DTransformedDescendant; }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
